Bug 1553527 - [testing] Add 'fission' to test manifest context r=jmaher
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Fri, 24 May 2019 18:41:14 +0000
changeset 475441 6f500136ccac851d370a52865dace619a9ac5c84
parent 475440 4490d364605d1a6dd88ad82fe587a827705f5b7a
child 475442 d003d1dd77b1caf791b97b438503c269db8348ed
push id86334
push userahalberstadt@mozilla.com
push dateFri, 24 May 2019 19:21:45 +0000
treeherderautoland@6f500136ccac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1553527
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1553527 - [testing] Add 'fission' to test manifest context r=jmaher Differential Revision: https://phabricator.services.mozilla.com/D32210
layout/tools/reftest/manifest.jsm
testing/mochitest/runtests.py
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
testing/xpcshell/runxpcshelltests.py
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@@ -544,17 +544,18 @@ sandbox.compareRetainedDisplayLists = g.
     }
 
     // Graphics features
     sandbox.usesRepeatResampling = sandbox.d2d;
 
     // Running in a test-verify session?
     sandbox.verify = prefs.getBoolPref("reftest.verify", false);
 
-    // Running with serviceworker e10s redesign enabled?
+    // Running with a variant enabled?
+    sandbox.fission = prefs.getBoolPref("fission.autostart", false);
     sandbox.serviceWorkerE10s = prefs.getBoolPref("dom.serviceWorkers.parent_intercept", false);
 
     if (!g.dumpedConditionSandbox) {
         g.logger.info("Dumping JSON representation of sandbox");
         g.logger.info(JSON.stringify(Cu.waiveXrays(sandbox)));
         g.dumpedConditionSandbox = true;
     }
 
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2570,16 +2570,17 @@ toolbar#nav-bar {
 
     def runTests(self, options):
         """ Prepare, configure, run tests and cleanup """
         self.extraPrefs = parse_preferences(options.extraPrefs)
 
         # for test manifest parsing.
         mozinfo.update({
             "e10s": options.e10s,
+            "fission": self.extraPrefs.get('fission.autostart', False),
             "headless": options.headless,
             "serviceworker_e10s": self.extraPrefs.get(
                 'dom.serviceWorkers.parent_intercept', False),
             "socketprocess_e10s": self.extraPrefs.get(
                 'network.process.enabled', False),
         })
 
         self.setTestRoot(options)
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -155,16 +155,17 @@ def run_info_extras(**kwargs):
             if pref == key:
                 return value.lower() in ('true', '1')
         return False
 
     rv = {"e10s": kwargs["gecko_e10s"],
           "wasm": kwargs.get("wasm", True),
           "verify": kwargs["verify"],
           "headless": "MOZ_HEADLESS" in os.environ,
+          "fission": get_bool_pref("fission.autostart"),
           "sw-e10s": get_bool_pref("dom.serviceWorkers.parent_intercept")}
     rv.update(run_info_browser_version(kwargs["binary"]))
     return rv
 
 
 def run_info_browser_version(binary):
     try:
         version_info = mozversion.get_version(binary)
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -1195,16 +1195,17 @@ class XPCShellTests(object):
         # All of the keys in question should be ASCII.
         fixedInfo = {}
         for k, v in self.mozInfo.items():
             if isinstance(k, unicode):
                 k = k.encode('ascii')
             fixedInfo[k] = v
         self.mozInfo = fixedInfo
 
+        self.mozInfo['fission'] = prefs.get('fission.autostart', False)
         self.mozInfo['serviceworker_e10s'] = prefs.get(
             'dom.serviceWorkers.parent_intercept', False)
 
         mozinfo.update(self.mozInfo)
 
         return True
 
     def runTests(self, options, testClass=XPCShellTestThread, mobileArgs=None):