From c00daa8ddd7339d6a13a10f4bf5ad6baa49d68a4 Mon Sep 17 00:00:00 2001 From: Butkovits Atila Date: Tue, 27 Sep 2022 10:30:08 +0300 Subject: [PATCH] Backed out changeset 4ce68ee50da2 (bug 1792021) as requested by Henrik. CLOSED TREE --- .../tests/tools/wptrunner/wptrunner/browsers/firefox.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py index 9dde38e7cdbb..0bf8166877d7 100644 --- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py +++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py @@ -63,15 +63,18 @@ def get_timeout_multiplier(test_type, run_info_data, **kwargs): return 4 else: return 2 - elif run_info_data.get("ccov"): - return 4 elif run_info_data["debug"] or run_info_data.get("asan") or run_info_data.get("tsan"): - return 3 + if run_info_data.get("ccov"): + return 4 + else: + return 3 elif run_info_data["os"] == "android": return 4 # https://bugzilla.mozilla.org/show_bug.cgi?id=1538725 elif run_info_data["os"] == "win" and run_info_data["processor"] == "aarch64": return 4 + elif run_info_data.get("ccov"): + return 2 return 1