Bug 1260772 - Update to latest wptrunner, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Wed, 23 Mar 2016 17:11:29 +0000
changeset 291252 6c39b1407e78b9f498f9d466dc74c681555eafa7
parent 291251 ad956e863c35f42c8b951bc83428a8425daad8de
child 291253 e9cff4b182abd31e332762bb0cd0d8c176d4df04
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1260772
milestone48.0a1
Bug 1260772 - Update to latest wptrunner, a=testonly MozReview-Commit-ID: GCPV4FfqHf0
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
@@ -51,21 +51,21 @@ 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 test_type == "reftest":
-            if run_info_data["debug"]:
+            if run_info_data["debug"] or run_info_data.get("asan"):
                 executor_kwargs["timeout_multiplier"] = 4
             else:
                 executor_kwargs["timeout_multiplier"] = 2
-        elif run_info_data["debug"]:
+        elif run_info_data["debug"] or run_info_data.get("asan"):
             executor_kwargs["timeout_multiplier"] = 3
     return executor_kwargs
 
 
 def env_options():
     return {"host": "127.0.0.1",
             "external_host": "web-platform.test",
             "bind_hostname": "false",