From 4bc1d664ea3e251d141ede7eb1f629797b50f7fb Mon Sep 17 00:00:00 2001 From: James Graham Date: Fri, 2 Oct 2015 10:51:22 +0100 Subject: [PATCH] Increase timeout for reftests running in firefox+e10s --- wptrunner/browsers/firefox.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wptrunner/browsers/firefox.py b/wptrunner/browsers/firefox.py index 6bbe282d3e8e68..d3698c22ecf046 100644 --- a/wptrunner/browsers/firefox.py +++ b/wptrunner/browsers/firefox.py @@ -53,8 +53,14 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data, executor_kwargs = base_executor_kwargs(test_type, server_config, cache_manager, **kwargs) executor_kwargs["close_after_done"] = True - if run_info_data["debug"] and kwargs["timeout_multiplier"] is None: - executor_kwargs["timeout_multiplier"] = 3 + if kwargs["timeout_multiplier"] is None: + if kwargs["gecko_e10s"] and 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 return executor_kwargs