Rename metadata directories

This 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`

etc/ci/update-wpt-checkout

@@ -86,7 +86,7 @@ function unsafe_update_metadata() {
     # Hope that any test result changes from layout-2013 are also applicable to layout-2020.
     ./mach update-wpt --layout-2020 "${1}" "${2}" "${3}" || return 2
     # Ensure any new directories or ini files are included in these changes.
-    git add tests/wpt/metadata tests/wpt/metadata-layout-2020 tests/wpt/mozilla/meta || return 3
+    git add tests/wpt/meta tests/wpt/metadata-legacy-layout tests/wpt/mozilla/meta tests/wpt/mozilla/meta-legacy-layout || return 3
     # Merge all changes with the existing commit.
     git commit -a --amend --no-edit || return 3
 }

etc/ci/wpt-scheduled-update.sh

@@ -17,9 +17,10 @@ function unsafe_update_metadata_chunk() {
         "wpt-logs-linux-layout-2020/test-wpt.${1}.log" || return 2
 
     # Ensure any new directories or ini files are included in these changes.
-    git add tests/wpt/metadata \
-        tests/wpt/metadata-layout-2020 \
-        tests/wpt/mozilla/meta || return 3
+    git add tests/wpt/meta \
+        tests/wpt/meta-legacy-layout \
+        tests/wpt/mozilla/meta \
+        tests/wpt/mozilla/meta-legacy-layout || return 3
 
     # Merge all changes with the existing commit.
     git commit -a --amend --no-edit || return 3

etc/unused_wpt_results.py

@@ -18,7 +18,7 @@
 import os
 
 test_root = os.path.join('tests', 'wpt', 'web-platform-tests')
-meta_root = os.path.join('tests', 'wpt', 'metadata')
+meta_root = os.path.join('tests', 'wpt', 'meta')
 
 missing_dirs = []
 
@@ -37,7 +37,7 @@ for base_dir, dir_names, files in os.walk(meta_root):
             missing_dirs += [meta_dir]
             continue
 
-        # Turn tests/wpt/metadata/foo into tests/wpt/web-platform-tests/foo.
+        # Turn tests/wpt/meta/foo into tests/wpt/web-platform-tests/foo.
         test_dir = os.path.join(test_root, os.path.relpath(meta_dir, meta_root))
         if not os.path.exists(test_dir):
             missing_dirs += [meta_dir]
@@ -48,7 +48,7 @@ for base_dir, dir_names, files in os.walk(meta_root):
         if fname in ['__dir__.ini', 'MANIFEST.json', 'mozilla-sync']:
             continue
 
-        # Turn tests/wpt/metadata/foo/bar.html.ini into tests/wpt/web-platform-tests/foo/bar.html.
+        # Turn tests/wpt/meta/foo/bar.html.ini into tests/wpt/web-platform-tests/foo/bar.html.
         test_dir = os.path.join(test_root, os.path.relpath(base_dir, meta_root))
         test_file = os.path.join(test_dir, fname)
         if not os.path.exists(os.path.splitext(test_file)[0]):

etc/wpt_result_analyzer.py

@@ -21,7 +21,7 @@
 import os
 
 test_root = os.path.join('tests', 'wpt', 'web-platform-tests')
-meta_root = os.path.join('tests', 'wpt', 'metadata')
+meta_root = os.path.join('tests', 'wpt', 'meta')
 
 test_counts = {}
 meta_counts = {}

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"
+    )

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,

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
 

servo-tidy.toml

@@ -103,8 +103,10 @@ files = [
   # Helper macro where actually a pseudo-element per line makes sense.
   "./components/style/gecko/non_ts_pseudo_class_list.rs",
   "./resources/hsts_preload.json",
-  "./tests/wpt/metadata/MANIFEST.json",
+  "./tests/wpt/meta/MANIFEST.json",
+  "./tests/wpt/meta-legacy-layout/MANIFEST.json",
   "./tests/wpt/mozilla/meta/MANIFEST.json",
+  "./tests/wpt/mozilla/meta-legacy-layout/MANIFEST.json",
   # Long encoded string
   "./tests/wpt/mozilla/tests/mozilla/resources/brotli.py",
   "./tests/wpt/webgl/meta/MANIFEST.json",

tests/wpt/README.md

@@ -10,7 +10,7 @@ In particular, this folder contains:
 * `config.ini`: some configuration for the web-platform-tests.
 * `include.ini`: the subset of web-platform-tests we currently run.
 * `web-platform-tests`: copy of the web-platform-tests.
-* `metadata`: expected failures for the web-platform-tests we run.
+* `meta`: expected failures for the web-platform-tests we run.
 * `mozilla`: web-platform-tests that cannot be upstreamed.
 
 Running the tests
@@ -156,7 +156,7 @@ Updating test expectations
 
 When fixing a bug that causes the result of a test to change, the expected
 results for that test need to be changed. This can be done manually, by editing
-the `.ini` file under the `metadata` folder that corresponds to the test. In
+the `.ini` file under the `meta` folder that corresponds to the test. In
 this case, remove the references to tests whose expectation is now `PASS`, and
 remove `.ini` files that no longer contain any expectations.
 

tests/wpt/config.ini

@@ -13,7 +13,7 @@ run-info = .
 
 [manifest:upstream]
 tests = web-platform-tests
-metadata = metadata
+metadata = meta
 url-base = /
 
 [manifest:mozilla]

tests/wpt/include-layout-2020.ini

@@ -1,44 +0,0 @@
-skip: true
-[_mozilla]
-  skip: true
-  [css]
-    skip: false
-  [mozilla]
-    skip: false
-[css]
-  skip: true
-  [CSS2]
-    skip: false
-  [css-animations]
-    skip: false
-  [css-masking]
-    [clip]
-      skip: false
-  [css-backgrounds]
-    skip: false
-  [css-content]
-    skip: false
-  [css-color]
-    skip: false
-  [css-flexbox]
-    skip: false
-  [css-logical]
-    skip: false
-  [css-position]
-    skip: false
-  [css-text-decor]
-    skip: false
-  [css-transforms]
-    skip: false
-  [css-transitions]
-    skip: false
-  [css-ui]
-    skip: false
-  [css-variables]
-    skip: false
-  [cssom]
-    skip: false
-  [cssom-view]
-    skip: false
-  [filter-effects]
-    skip: false

tests/wpt/include-legacy-layout.ini

@@ -0,0 +1,209 @@
+skip: true
+[_mozilla]
+  skip: false
+  [mozilla]
+    skip: false
+[_webgl]
+  skip: false
+[cookies]
+  skip: false
+  [samesite]
+    skip: true
+[cors]
+  skip: false
+[css]
+  skip: true
+  [compositing]
+    skip: false
+  [CSS2]
+    skip: false
+    [linebox]
+      skip:false
+  [css-align]
+    skip: false
+  [css-animations]
+    skip: false
+  [css-backgrounds]
+    skip: false
+  [css-borders]
+    skip: false
+  [css-color]
+    skip: false
+  [css-conditional]
+    skip: false
+  [css-flexbox]
+    skip: false
+  [css-fonts]
+    skip: false
+  [css-images]
+    skip: false
+  [css-outline]
+    skip: false
+  [css-paint-api]
+    skip: false
+  [css-position]
+    skip: false
+  [css-style-attr]
+    skip: false
+  [css-text]
+    skip: false
+    [i18n]
+      skip: true
+  [css-text-decor]
+    skip: false
+  [css-transforms]
+    skip: false
+  [css-transitions]
+    skip: false
+  [css-ui]
+    skip: false
+  [css-values]
+    skip: false
+  [css-variables]
+    skip: false
+  [cssom]
+    skip: false
+  [cssom-view]
+    skip: false
+  [filter-effects]
+    skip: false
+  [geometry]
+    skip: false
+  [mediaqueries]
+    skip: false
+  [selectors]
+    skip: false
+[custom-elements]
+  skip: false
+[dom]
+  skip: false
+[domparsing]
+  skip: false
+[encoding]
+  skip: false
+[eventsource]
+  skip: false
+[fetch]
+  skip: false
+[FileAPI]
+  skip: false
+[fullscreen]
+  skip: false
+[gamepad]
+  skip: false
+[hr-time]
+  skip: false
+[html]
+  skip: false
+  [cross-origin-embedder-policy]
+    skip: true
+  [cross-origin-opener-policy]
+    skip: true
+  [infrastructure]
+    skip: false
+    [safe-passing-of-structured-data]
+      skip: false
+      [shared-array-buffers]
+        skip: true
+  [semantics]
+    skip: false
+    [document-metadata]
+      skip: false
+      [the-meta-element]
+        skip: false
+        [pragma-directives]
+          skip: false
+          [attr-meta-http-equiv-refresh]
+            skip: true
+    [embedded-content]
+      skip: false
+      [media-elements]
+        skip: false
+        [track]
+          skip: false
+          [track-element]
+            skip: false
+            [cors]
+              skip: true
+    [scripting-1]
+      skip: false
+      [the-script-element]
+        skip: false
+        [json-module]
+          skip: true
+        [moving-between-documents]
+          skip: true
+[js]
+  skip: false
+[mediasession]
+  skip: false
+[navigation-timing]
+  skip: false
+[old-tests]
+  skip: true
+  [submission]
+    skip: true
+[performance-timeline]
+  skip: false
+[permissions]
+  skip: false
+[quirks]
+  skip: false
+[referrer-policy]
+  skip: false
+  [gen]
+    skip: false
+    [srcdoc-inherit.http-rp]
+      skip: true
+    [srcdoc-inherit.meta]
+      skip: true
+    [srcdoc.meta]
+      skip: true
+[resource-timing]
+  skip: false
+[selection]
+  skip: false
+[streams]
+  skip: true
+  [readable-streams]
+    skip: false
+[subresource-integrity]
+  skip: false
+[touch-events]
+  skip: false
+[uievents]
+  skip: false
+[url]
+  skip: false
+[wasm]
+  skip: false
+[webaudio]
+  skip: false
+[WebCryptoAPI]
+  skip: false
+[webgl]
+  skip: false
+[webidl]
+  skip: false
+[webvr]
+  skip: false
+[webvtt]
+  skip: true
+  [api]
+    skip: false
+[webxr]
+  skip: false
+  [dom-overlay]
+    skip: true
+[webmessaging]
+  skip: false
+[websockets]
+  skip: false
+[webstorage]
+  skip: false
+[workers]
+  skip: false
+  [modules]
+    skip: true
+[xhr]
+  skip: false

tests/wpt/include.ini

@@ -1,54 +1,31 @@
 skip: true
 [_mozilla]
-  skip: false
+  skip: true
+  [css]
+    skip: false
   [mozilla]
     skip: false
-[_webgl]
-  skip: false
-[cookies]
-  skip: false
-  [samesite]
-    skip: true
-[cors]
-  skip: false
 [css]
   skip: true
-  [compositing]
-    skip: false
   [CSS2]
     skip: false
-    [linebox]
-      skip:false
-  [css-align]
-    skip: false
   [css-animations]
     skip: false
+  [css-masking]
+    [clip]
+      skip: false
   [css-backgrounds]
     skip: false
-  [css-borders]
+  [css-content]
     skip: false
   [css-color]
     skip: false
-  [css-conditional]
-    skip: false
   [css-flexbox]
     skip: false
-  [css-fonts]
-    skip: false
-  [css-images]
-    skip: false
-  [css-outline]
-    skip: false
-  [css-paint-api]
+  [css-logical]
     skip: false
   [css-position]
     skip: false
-  [css-style-attr]
-    skip: false
-  [css-text]
-    skip: false
-    [i18n]
-      skip: true
   [css-text-decor]
     skip: false
   [css-transforms]
@@ -57,8 +34,6 @@ skip: true
     skip: false
   [css-ui]
     skip: false
-  [css-values]
-    skip: false
   [css-variables]
     skip: false
   [cssom]
@@ -67,143 +42,3 @@ skip: true
     skip: false
   [filter-effects]
     skip: false
-  [geometry]
-    skip: false
-  [mediaqueries]
-    skip: false
-  [selectors]
-    skip: false
-[custom-elements]
-  skip: false
-[dom]
-  skip: false
-[domparsing]
-  skip: false
-[encoding]
-  skip: false
-[eventsource]
-  skip: false
-[fetch]
-  skip: false
-[FileAPI]
-  skip: false
-[fullscreen]
-  skip: false
-[gamepad]
-  skip: false
-[hr-time]
-  skip: false
-[html]
-  skip: false
-  [cross-origin-embedder-policy]
-    skip: true
-  [cross-origin-opener-policy]
-    skip: true
-  [infrastructure]
-    skip: false
-    [safe-passing-of-structured-data]
-      skip: false
-      [shared-array-buffers]
-        skip: true
-  [semantics]
-    skip: false
-    [document-metadata]
-      skip: false
-      [the-meta-element]
-        skip: false
-        [pragma-directives]
-          skip: false
-          [attr-meta-http-equiv-refresh]
-            skip: true
-    [embedded-content]
-      skip: false
-      [media-elements]
-        skip: false
-        [track]
-          skip: false
-          [track-element]
-            skip: false
-            [cors]
-              skip: true
-    [scripting-1]
-      skip: false
-      [the-script-element]
-        skip: false
-        [json-module]
-          skip: true
-        [moving-between-documents]
-          skip: true
-[js]
-  skip: false
-[mediasession]
-  skip: false
-[navigation-timing]
-  skip: false
-[old-tests]
-  skip: true
-  [submission]
-    skip: true
-[performance-timeline]
-  skip: false
-[permissions]
-  skip: false
-[quirks]
-  skip: false
-[referrer-policy]
-  skip: false
-  [gen]
-    skip: false
-    [srcdoc-inherit.http-rp]
-      skip: true
-    [srcdoc-inherit.meta]
-      skip: true
-    [srcdoc.meta]
-      skip: true
-[resource-timing]
-  skip: false
-[selection]
-  skip: false
-[streams]
-  skip: true
-  [readable-streams]
-    skip: false
-[subresource-integrity]
-  skip: false
-[touch-events]
-  skip: false
-[uievents]
-  skip: false
-[url]
-  skip: false
-[wasm]
-  skip: false
-[webaudio]
-  skip: false
-[WebCryptoAPI]
-  skip: false
-[webgl]
-  skip: false
-[webidl]
-  skip: false
-[webvr]
-  skip: false
-[webvtt]
-  skip: true
-  [api]
-    skip: false
-[webxr]
-  skip: false
-  [dom-overlay]
-    skip: true
-[webmessaging]
-  skip: false
-[websockets]
-  skip: false
-[webstorage]
-  skip: false
-[workers]
-  skip: false
-  [modules]
-    skip: true
-[xhr]
-  skip: false