Auto merge of #29916 - mrobinson:rename-meta-directories, r=atbrakhi

Rename metadata directories

Rename metadata directories and update all references. This is in preparation
for making Layout 2020 the default layout system.

This does the following renames:
 - `tests/wpt/metadata` → `tests/wpt/meta-legacy-layout`
 - `tests/wpt/metadata-layout-2020` → `tests/wpt/meta`
 - `tests/wpt/mozilla/meta` → `tests/wpt/mozilla/meta-legacy-layout`
 - `tests/wpt/mozilla/meta-layout-2020` → `tests/wpt/mozilla/meta`

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they change how tests are run.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

3 files changed, 15 insertions, 14 deletions

diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py
index a1ecf5001c3..a8276a506ce 100644
--- a/python/wpt/__init__.py
+++ b/python/wpt/__init__.py
@@ -50,14 +50,15 @@ def create_parser():
     return parser
 
 
-def update_args_for_layout_2020(kwargs: dict):
+def update_args_for_legacy_layout(kwargs: dict):
     if kwargs.pop("layout_2020"):
-        kwargs["test_paths"]["/"]["metadata_path"] = os.path.join(
-            WPT_PATH, "metadata-layout-2020"
-        )
-        kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join(
-            WPT_PATH, "mozilla", "meta-layout-2020"
-        )
-        kwargs["include_manifest"] = os.path.join(
-            WPT_PATH, "include-layout-2020.ini"
-        )
+        return
+    kwargs["test_paths"]["/"]["metadata_path"] = os.path.join(
+        WPT_PATH, "meta-legacy-layout"
+    )
+    kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join(
+        WPT_PATH, "mozilla", "meta-legacy-layout"
+    )
+    kwargs["include_manifest"] = os.path.join(
+        WPT_PATH, "include-legacy-layout.ini"
+    )
diff --git a/python/wpt/run.py b/python/wpt/run.py
index 021331064e0..387ce2dbfe6 100644
--- a/python/wpt/run.py
+++ b/python/wpt/run.py
@@ -18,7 +18,7 @@ from typing import List, NamedTuple, Optional, Union
 import mozlog
 import mozlog.formatters
 
-from . import SERVO_ROOT, WPT_PATH, WPT_TOOLS_PATH, update_args_for_layout_2020
+from . import SERVO_ROOT, WPT_PATH, WPT_TOOLS_PATH, update_args_for_legacy_layout
 from .grouping_formatter import (
     ServoFormatter, ServoHandler,
     UnexpectedResult, UnexpectedSubtestResult
@@ -116,7 +116,7 @@ def run_tests(**kwargs):
     raw_log_outputs = kwargs.get("log_raw", [])
 
     wptcommandline.check_args(kwargs)
-    update_args_for_layout_2020(kwargs)
+    update_args_for_legacy_layout(kwargs)
 
     mozlog.commandline.log_formatters["servo"] = (
         ServoFormatter,
diff --git a/python/wpt/update.py b/python/wpt/update.py
index 377ba06e3ce..a31598c09fb 100644
--- a/python/wpt/update.py
+++ b/python/wpt/update.py
@@ -5,7 +5,7 @@
 
 import os
 
-from . import WPT_PATH, update_args_for_layout_2020
+from . import WPT_PATH, update_args_for_legacy_layout
 from . import importer
 
 
@@ -20,7 +20,7 @@ def update_tests(**kwargs):
     kwargs["store_state"] = False
 
     importer.check_args(kwargs)
-    update_args_for_layout_2020(kwargs)
+    update_args_for_legacy_layout(kwargs)
 
     return 1 if not importer.run_update(**kwargs) else 0