Bug 1230963 - Increase the timeout for non-e10s web-platform-tests debug reftests, r=Ms2ger
authorJames Graham <james@hoppipolla.co.uk>
Mon, 07 Dec 2015 10:54:19 +0000
changeset 314595 d996266433adbb33362e8eaacf32f4fc357e714c
parent 314594 3075a8f23ed22316f1c0f6a8dabcba52081d2890
child 314596 3fcd9e46778851b61a80df69be4c9f59ab46d9da
push id8237
push userjbeich@vfemail.net
push dateTue, 08 Dec 2015 12:55:06 +0000
reviewersMs2ger
bugs1230963
milestone45.0a1
Bug 1230963 - Increase the timeout for non-e10s web-platform-tests debug reftests, r=Ms2ger
testing/web-platform/harness/wptrunner/browsers/firefox.py
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -49,25 +49,23 @@ def browser_kwargs(**kwargs):
 
 
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, **kwargs)
     executor_kwargs["close_after_done"] = True
     if kwargs["timeout_multiplier"] is None:
-        if kwargs["gecko_e10s"] and test_type == "reftest":
+        if test_type == "reftest":
             if run_info_data["debug"]:
                 executor_kwargs["timeout_multiplier"] = 4
             else:
                 executor_kwargs["timeout_multiplier"] = 2
         elif run_info_data["debug"]:
             executor_kwargs["timeout_multiplier"] = 3
-        elif test_type == "reftest":
-            executor_kwargs["timeout_multiplier"] = 2
     return executor_kwargs
 
 
 def env_options():
     return {"host": "127.0.0.1",
             "external_host": "web-platform.test",
             "bind_hostname": "false",
             "certificate_domain": "web-platform.test",