Backed out changeset bf17ad5b022f (bug 1470266) for breaking test-verify.

devtools/client/application/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
-skip-if = serviceworker_e10s
 support-files =
   head.js
   service-workers/debug-sw.js

dom/push/test/mochitest.ini

@@ -25,6 +25,5 @@ skip-if = os == "win" # Bug 1373346
 [test_try_registering_offline_disabled.html]
 skip-if = os == "win" # Bug 1373346
 [test_serviceworker_lifetime.html]
-skip-if = serviceworker_e10s || !e10s || os == "win" # e10s: Bug 1433689, Windows: Bug 1373346
+skip-if = !e10s || os == "win" # e10s: Bug 1433689, Windows: Bug 1373346
 [test_error_reporting.html]
-skip-if = serviceworker_e10s

dom/serviceworkers/test/browser.ini

@@ -16,7 +16,6 @@ support-files =
   utils.js
 
 [browser_devtools_serviceworker_interception.js]
-skip-if = serviceworker_e10s
 [browser_force_refresh.js]
 [browser_download.js]
 [browser_download_canceled.js]
@@ -24,7 +23,6 @@ skip-if = verify
 [browser_storage_permission.js]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [browser_storage_recovery.js]
-skip-if = serviceworker_e10s
 [browser_unregister_with_containers.js]
 [browser_userContextId_openWindow.js]
-skip-if = !e10s || serviceworker_e10s
+skip-if = !e10s

dom/serviceworkers/test/mochitest.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 
-skip-if = serviceworker_e10s
 support-files =
   worker.js
   worker2.js

taskcluster/ci/config.yml

@@ -16,9 +16,7 @@ treeherder:
         'Fxfn-r': 'Firefox functional tests (remote)'
         'Fxfn-r-e10s': 'Firefox functional tests (remote) with e10s'
         'M': 'Mochitests'
-        'M-sw': 'Mochitests with serviceworker redesign'
         'M-e10s': 'Mochitests with e10s'
-        'M-sw-e10s': 'Mochitests with serviceworker redesign and e10s'
         'M-V': 'Mochitests on Valgrind'
         'R': 'Reftests'
         'R-sw': 'Reftests with serviceworker redesign enabled'

taskcluster/ci/test/mochitest.yml

@@ -7,10 +7,6 @@ job-defaults:
         by-test-platform:
             android-em-7.0-x86/opt: 3
             default: default
-    serviceworker-e10s:
-        by-test-platform:
-            linux64/debug: both
-            default: false
     mozharness:
         script:
             by-test-platform:
@@ -360,7 +356,6 @@ mochitest-valgrind:
     # We could re-enable e10s later.
     # There's no intrinsic reason not to use it.
     e10s: false
-    serviceworker-e10s: false
     allow-software-gl-layers: false
     mozharness:
         mochitest-flavor: plain

testing/mochitest/runrobocop.py

@@ -241,7 +241,6 @@ class RobocopTestRunner(MochitestDesktop):
             'mochikit@mozilla.org',
         ])
 
-        self.options.extraPrefs = self.parseExtraPrefs(self.options.extraPrefs)
         manifest = MochitestDesktop.buildProfile(self, self.options)
         self.localProfile = self.options.profilePath
         self.log.debug("Profile created at %s" % self.localProfile)

testing/mochitest/runtests.py

@@ -908,7 +908,7 @@ class MochitestDesktop(object):
         kwargs['log'] = self.log
         return test_environment(**kwargs)
 
-    def parseExtraPrefs(self, prefs):
+    def extraPrefs(self, prefs):
         """Interpolate extra preferences from option strings"""
 
         try:
@@ -1936,7 +1936,7 @@ toolbar#nav-bar {
         self.profile.set_preferences(prefs)
 
         # Extra prefs from --setpref
-        self.profile.set_preferences(options.extraPrefs)
+        self.profile.set_preferences(self.extraPrefs(options.extraPrefs))
         return manifest
 
     def getGMPPluginPath(self, options):
@@ -2559,20 +2559,13 @@ toolbar#nav-bar {
 
     def runTests(self, options):
         """ Prepare, configure, run tests and cleanup """
-        options.extraPrefs = self.parseExtraPrefs(options.extraPrefs)
 
         # a11y and chrome tests don't run with e10s enabled in CI. Need to set
         # this here since |mach mochitest| sets the flavor after argument parsing.
         if options.flavor in ('a11y', 'chrome'):
             options.e10s = False
-
-        # for test manifest parsing.
-        mozinfo.update({
-            "e10s": options.e10s,
-            "headless": options.headless,
-            "serviceworker_e10s": options.extraPrefs.get(
-                'dom.serviceWorkers.parent_intercept', False),
-        })
+        mozinfo.update({"e10s": options.e10s})  # for test manifest parsing.
+        mozinfo.update({"headless": options.headless})  # for test manifest parsing.
 
         if options.jscov_dir_prefix is not None:
             mozinfo.update({'coverage': True})
@@ -2601,18 +2594,17 @@ toolbar#nav-bar {
         # code for --run-by-manifest
         manifests = set(t['manifest'] for t in tests)
         result = 0
-
-        origPrefs = options.extraPrefs.copy()
+        origPrefs = options.extraPrefs[:]
         for m in sorted(manifests):
             self.log.info("Running manifest: {}".format(m))
 
             prefs = list(self.prefs_by_manifest[m])[0]
-            options.extraPrefs = origPrefs.copy()
+            options.extraPrefs = origPrefs[:]
             if prefs:
                 prefs = prefs.strip().split()
                 self.log.info("The following extra prefs will be set:\n  {}".format(
                     '\n  '.join(prefs)))
-                options.extraPrefs.update(self.parseExtraPrefs(prefs))
+                options.extraPrefs.extend(prefs)
 
             # If we are using --run-by-manifest, we should not use the profile path (if) provided
             # by the user, since we need to create a new directory for each run. We would face
@@ -2799,8 +2791,6 @@ toolbar#nav-bar {
                     testURL += "?" + "&".join(self.urlOpts)
 
                 self.log.info("runtests.py | Running with e10s: {}".format(options.e10s))
-                self.log.info("runtests.py | Running with serviceworker_e10s: {}".format(
-                    mozinfo.info.get('serviceworker_e10s', False)))
                 self.log.info("runtests.py | Running tests: start.\n")
                 ret, _ = self.runApp(
                     testURL,

testing/mochitest/tests/Harness_sanity/mochitest.ini

@@ -10,10 +10,9 @@ support-files = importtesting_chromescript.js
 [test_sanityException2.html]
 [test_sanityParams.html]
 [test_sanityRegisteredServiceWorker.html]
-skip-if = serviceworker_e10s
 support-files = empty.js
 [test_sanityRegisteredServiceWorker2.html]
-skip-if = verify || serviceworker_e10s
+skip-if = verify
 support-files = empty.js
 [test_sanityWindowSnapshot.html]
 [test_SpecialPowersExtension.html]

toolkit/components/antitracking/test/browser/browser.ini

@@ -19,7 +19,6 @@ support-files =
 support-files = server.sjs
 [browser_blockingIndexedDb.js]
 [browser_blockingStorage.js]
-skip-if = serviceworker_e10s
 [browser_blockingWorkers.js]
 skip-if = (os == "win" && os_version == "6.1" && bits == 32 && !debug) # Bug 1491937
 [browser_blockingMessaging.js]
@@ -57,16 +56,12 @@ skip-if = (os == "win" && os_version == "6.1" && bits == 32 && !debug) # Bug 149
 [browser_onBeforeRequestNotificationForTrackingResources.js]
 [browser_onModifyRequestNotificationForTrackingResources.js]
 [browser_permissionInNormalWindows.js]
-skip-if = serviceworker_e10s
 [browser_permissionInPrivateWindows.js]
-skip-if = serviceworker_e10s
 [browser_subResources.js]
 support-files = subResources.sjs
 [browser_script.js]
 support-files = tracker.js
 [browser_userInteraction.js]
 [browser_storageAccessPrivateWindow.js]
-skip-if = serviceworker_e10s
 [browser_storageAccessSandboxed.js]
-skip-if = serviceworker_e10s
 [browser_storageAccessWithHeuristics.js]