Bug 1917582 - Fix mach addtest for wpt tests, r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D221473

Author: jgraham

testing/addtest.py

@@ -351,8 +351,7 @@ def write_to_manifest_file(manifest_file, filename):
 
 
 def creator_for_suite(suite):
-    if suite.split("-")[0] == "mochitest":
-        base_suite = "mochitest"
-    else:
-        base_suite = suite.rsplit("-", 1)[0]
-    return TEST_CREATORS.get(base_suite)
+    for key, creator in TEST_CREATORS.items():
+        if suite.startswith(key):
+            return creator
+    return None

testing/mach_commands.py

@@ -74,15 +74,15 @@ def get_test_parser():
     "mochitest-chrome",
     "mochitest-plain",
     "mochitest-browser-chrome",
-    "web-platform-tests-testharness",
+    "web-platform-tests",
     "web-platform-tests-reftest",
     "xpcshell",
 ]
 ADD_TEST_SUPPORTED_DOCS = ["js", "html", "xhtml", "xul"]
 
 SUITE_SYNONYMS = {
-    "wpt": "web-platform-tests-testharness",
-    "wpt-testharness": "web-platform-tests-testharness",
+    "wpt": "web-platform-tests",
+    "wpt-testharness": "web-platform-tests",
     "wpt-reftest": "web-platform-tests-reftest",
 }
 
@@ -297,7 +297,7 @@ def guess_suite(abs_test):
     )
 
     if in_wpt_folder:
-        guessed_suite = "web-platform-tests-testharness"
+        guessed_suite = "web-platform-tests"
         if "/css/" in abs_test:
             guessed_suite = "web-platform-tests-reftest"
     elif (