From 08aad2dacda839e7016416f3eca1c0844d6313ad Mon Sep 17 00:00:00 2001
From: Razvan Maries <rmaries@mozilla.com>
Date: Wed, 17 Jun 2020 01:52:28 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1643177) for multiple webdriver
 perma failures. CLOSED TREE

Backed out changeset 745ca9baa9c8 (bug 1643177)
Backed out changeset 3acd697a9131 (bug 1643177)
---
 taskcluster/ci/test/web-platform.yml          | 20 +++++++++----------
 .../mozharness/scripts/web_platform_tests.py  |  4 ----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index e59fbeacd047..8b59951c9d4a 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -87,16 +87,16 @@ web-platform-tests-backlog:
     treeherder-symbol: W-b(wpt)
     chunks:
         by-test-platform:
-            android.*: 3
-            linux.*64-asan/opt: 3
-            linux.*64-ccov/opt: 3
-            linux.*/debug: 3
-            macosx.*/debug: 3
-            windows7.*/opt: 1
-            windows7.*/debug: 3
-            windows10.*/debug: 1
-            windows10-64-ccov/opt: 3
-            default: 1
+            android.*: 6
+            linux.*64-asan/opt: 6
+            linux.*64-ccov/opt: 6
+            linux.*/debug: 6
+            macosx.*/debug: 5
+            windows7.*/opt: 3
+            windows7.*/debug: 5
+            windows10.*/debug: 3
+            windows10-64-ccov/opt: 6
+            default: 3
     max-run-time:
         by-test-platform:
             .*/debug: 7200
diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py
index f8568034568c..006eceaee6a2 100755
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -280,10 +280,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
         for implementation_status in c["skip_implementation_status"]:
             cmd.append("--skip-implementation-status=%s" % implementation_status)
 
-        # Bug 1643177
-        if 'backlog' not in c["skip_implementation_status"]:
-            cmd.append("--timeout-multiplier=0.25")
-
         test_paths = set()
         if not (self.verify_enabled or self.per_test_coverage):
             mozharness_test_paths = json.loads(os.environ.get('MOZHARNESS_TEST_PATHS', '""'))