Merge pull request #164 from w3c/jgraham/firefox-reftest-timeout

Increase the timeout for reftests in Firefox-non-e10s-debug.
web-platform-tests · Dec 8, 2015 · 32abf5c · 32abf5c
2 parents 045e705 + 390aa8a
commit 32abf5c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/wptrunner/browsers/firefox.py b/wptrunner/browsers/firefox.py
@@ -55,15 +55,13 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                                            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