From c50e49f36995d3ee5be12e57029c84dcf661b01f Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 26 Aug 2015 18:16:58 +0100 Subject: [PATCH] Bug 1199127 - Update to latest wptrunner, a=testonly --- .../web-platform/harness/wptrunner/browsers/firefox.py | 8 ++++++-- testing/web-platform/harness/wptrunner/wptcommandline.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/testing/web-platform/harness/wptrunner/browsers/firefox.py b/testing/web-platform/harness/wptrunner/browsers/firefox.py index 127308a7080..08670e4d583 100644 --- a/testing/web-platform/harness/wptrunner/browsers/firefox.py +++ b/testing/web-platform/harness/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 @@ class FirefoxBrowser(Browser): 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 @@ class FirefoxBrowser(Browser): "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/testing/web-platform/harness/wptrunner/wptcommandline.py b/testing/web-platform/harness/wptrunner/wptcommandline.py index b01b7a047fb..e9e42a0b01f 100644 --- a/testing/web-platform/harness/wptrunner/wptcommandline.py +++ b/testing/web-platform/harness/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,