From dd17a4001e6a18f21e886dccd4843561b02ed140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Fri, 29 Nov 2019 14:39:49 +0000 Subject: [PATCH] Bug 1598629 - Part 2: Re-enable disable start button mochitest r=jdescottes Differential Revision: https://phabricator.services.mozilla.com/D54964 --HG-- extra : moz-landing-system : lando --- .../client/application/test/browser/browser.ini | 4 ++-- ...plication_panel_disable-start-service-worker.js | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/devtools/client/application/test/browser/browser.ini b/devtools/client/application/test/browser/browser.ini index 2c5fc2930408..526b9629571a 100644 --- a/devtools/client/application/test/browser/browser.ini +++ b/devtools/client/application/test/browser/browser.ini @@ -30,7 +30,7 @@ support-files = [browser_application_panel_debug-service-worker.js] skip-if = debug || asan # Bug 1559591, 1575578 [browser_application_panel_disable-start-service-worker.js] -skip-if = (os == 'linux' && asan) || debug || serviceworker_e10s # Bug 1559487, 1559591, 1447197 +skip-if = (os == 'linux' && asan) || debug # Bug 1559487, 1559591 [browser_application_panel_list-domain-workers.js] skip-if = debug # Bug 1559591 [browser_application_panel_list-several-workers.js] @@ -49,4 +49,4 @@ skip-if = true # Bug 1467256, 1559591 [browser_application_panel_unregister-worker.js] skip-if = debug # Bug 1559591 [browser_application_panel_start-service-worker.js] -skip-if = (os == 'linux' && asan) || debug # Bug 1559487, 1559591, 1447197 +skip-if = (os == 'linux' && asan) || debug # Bug 1559487, 1559591 diff --git a/devtools/client/application/test/browser/browser_application_panel_disable-start-service-worker.js b/devtools/client/application/test/browser/browser_application_panel_disable-start-service-worker.js index a9c51a2be679..d8ee16ab76ce 100644 --- a/devtools/client/application/test/browser/browser_application_panel_disable-start-service-worker.js +++ b/devtools/client/application/test/browser/browser_application_panel_disable-start-service-worker.js @@ -11,9 +11,19 @@ const TAB_URL = URL_ROOT + "resources/service-workers/simple.html"; add_task(async function() { await enableApplicationPanel(); - // disable sw debugging by increasing the # of processes and thus multi-e10s kicking in + // Setting a low idle_timeout and idle_extended_timeout will allow the service worker + // to reach the STOPPED state quickly, which will allow us to test the start button. + // The default value is 30000 milliseconds. + info("Set a low service worker idle timeout"); + await pushPref("dom.serviceWorkers.idle_timeout", 1000); + await pushPref("dom.serviceWorkers.idle_extended_timeout", 1000); + + // disable sw debugging info("Disable service worker debugging"); - await pushPref("dom.ipc.processCount", 8); + await pushPref( + "devtools.debugger.features.windowless-service-workers", + false + ); const { panel, tab, target } = await openNewTabAndApplicationPanel(TAB_URL); const doc = panel.panelWin.document;