Add option to run firefox tests with e10s enabled.

w3c · Aug 26, 2015 · e06a665 · e06a665
1 parent 4e46786
commit e06a665
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/wptrunner/browsers/firefox.py b/wptrunner/browsers/firefox.py
@@ -43,7 +43,8 @@ def browser_kwargs(**kwargs):
             "symbols_path": kwargs["symbols_path"],
             "stackwalk_binary": kwargs["stackwalk_binary"],
             "certutil_binary": kwargs["certutil_binary"],
-            "ca_certificate_path": kwargs["ssl_env"].ca_cert_path()}
+            "ca_certificate_path": kwargs["ssl_env"].ca_cert_path(),
+            "e10s": kwargs["gecko_e10s"]}
 
 
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
@@ -69,7 +70,7 @@ class FirefoxBrowser(Browser):
 
     def __init__(self, logger, binary, prefs_root, debug_info=None,
                  symbols_path=None, stackwalk_binary=None, certutil_binary=None,
-                 ca_certificate_path=None):
+                 ca_certificate_path=None, e10s=False):
         Browser.__init__(self, logger)
         self.binary = binary
         self.prefs_root = prefs_root
@@ -81,6 +82,7 @@ def __init__(self, logger, binary, prefs_root, debug_info=None,
         self.stackwalk_binary = stackwalk_binary
         self.ca_certificate_path = ca_certificate_path
         self.certutil_binary = certutil_binary
+        self.e10s = e10s
 
     def start(self):
         self.marionette_port = get_free_port(2828, exclude=self.used_ports)
@@ -99,6 +101,8 @@ def start(self):
                                       "marionette.defaultPrefs.port": self.marionette_port,
                                       "dom.disable_open_during_load": False,
                                       "network.dns.localDomains": ",".join(hostnames)})
+        if self.e10s:
+            self.profile.set_preferences({"browser.tabs.remote.autostart": True})
 
         if self.ca_certificate_path is not None:
             self.setup_ssl()

diff --git a/wptrunner/wptcommandline.py b/wptrunner/wptcommandline.py
@@ -154,6 +154,8 @@ def create_parser(product_choices=None):
     gecko_group = parser.add_argument_group("Gecko-specific")
     gecko_group.add_argument("--prefs-root", dest="prefs_root", action="store", type=abs_path,
                              help="Path to the folder containing browser prefs")
+    gecko_group.add_argument("--e10s", dest="gecko_e10s", action="store_true",
+                             help="Path to the folder containing browser prefs")
 
     b2g_group = parser.add_argument_group("B2G-specific")
     b2g_group.add_argument("--b2g-no-backup", action="store_true", default=False,