Bug 1472067 [wpt PR 11723] - Revert "Lint that META.yml files exist", a=testonly
authorGeoffrey Sneddon <me@gsnedders.com>
Fri, 06 Jul 2018 23:33:23 +0000
changeset 426104 fe3d853eb1e487a8a9a02780bf3b491b345d3e03
parent 426103 4ac7c605b3c89617382de2dbabbbc2329d927de3
child 426105 1560ff93d553e604f9c3be70e68808746516c342
push id34267
push userrgurzau@mozilla.com
push dateWed, 11 Jul 2018 22:05:21 +0000
treeherdermozilla-central@3aca103e4915 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1472067, 11723, 11092
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1472067 [wpt PR 11723] - Revert "Lint that META.yml files exist", a=testonly Automatic update from web-platform-testsRevert "Lint that META.yml files exist (#11092)" (#11723) This reverts commit 93dceabca4f79ced2a35fa480f78d30d4123ffaa. -- wpt-commits: 7a6f5673ff5d146ca5c09c6a1b42b7706cfee328 wpt-pr: 11723
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/lint.whitelist
testing/web-platform/tests/tools/lint/lint.py
testing/web-platform/tests/tools/lint/tests/dummy/broken.html
testing/web-platform/tests/tools/lint/tests/dummy/broken_ignored.html
testing/web-platform/tests/tools/lint/tests/dummy/css/css-unique/META.yml
testing/web-platform/tests/tools/lint/tests/dummy/dependency.html
testing/web-platform/tests/tools/lint/tests/dummy/lint.whitelist
testing/web-platform/tests/tools/lint/tests/dummy/okay.html
testing/web-platform/tests/tools/lint/tests/dummy/ref/META.yml
testing/web-platform/tests/tools/lint/tests/dummy/ref/existent_root_relative.html
testing/web-platform/tests/tools/lint/tests/dummy/tests/META.yml
testing/web-platform/tests/tools/lint/tests/dummy/tests/broken.html
testing/web-platform/tests/tools/lint/tests/dummy/tests/broken_ignored.html
testing/web-platform/tests/tools/lint/tests/dummy/tests/dependency.html
testing/web-platform/tests/tools/lint/tests/dummy/tests/foo/META.yml
testing/web-platform/tests/tools/lint/tests/dummy/tests/foo/okay.html
testing/web-platform/tests/tools/lint/tests/dummy/tests/okay.html
testing/web-platform/tests/tools/lint/tests/test_lint.py
testing/web-platform/tests/tools/manifest/sourcefile.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -409621,17 +409621,17 @@
    "3e4c2ec3696939abd1849dee0809e40c1ecb12a7",
    "support"
   ],
   "./check_stability.ini": [
    "5addd67f09e895336644c5a9f5049c03e1ffe615",
    "support"
   ],
   "./lint.whitelist": [
-   "365b43f66ce7b6d81314f8aecf8e245cf6ec53e5",
+   "1fd41d38b2af42fffea5bc09c0348feb0f078e85",
    "support"
   ],
   "./serve.py": [
    "0efa39b1f26f86d73f2fce4f9e46003d62057b41",
    "support"
   ],
   "./server-side.md": [
    "c51b17fbac2a2e3121dc74f7badbd2873ce92f61",
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -767,14 +767,11 @@ MISSING-LINK: css/cssom-view/scrollingEl
 MISSING-LINK: css/cssom-view/scrollIntoView-shadow.html
 MISSING-LINK: css/cssom-view/scrollIntoView-smooth.html
 MISSING-LINK: css/cssom-view/scrollTop-display-change.html
 
 # TODO https://github.com/web-platform-tests/wpt/issues/5770
 MISSING-LINK: css/geometry/*.worker.js
 MISSING-LINK: css/filter-effects/*.any.js
 
-# TODO https://github.com/web-platform-tests/wpt/pull/11710
-MISSING-META-YML: css/css-box
-
 # Tests that use WebKit/Blink testing APIs
 LAYOUTTESTS APIS: css/css-regions/interactivity/*
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
--- a/testing/web-platform/tests/tools/lint/lint.py
+++ b/testing/web-platform/tests/tools/lint/lint.py
@@ -258,62 +258,16 @@ def check_css_globally_unique(repo_root,
                                        "The filename %s is shared by: %s" % (name,
                                                                              ", ".join(sorted(colliding))),
                                        x,
                                        None))
 
     return errors
 
 
-def check_meta_yml(repo_root, paths):
-    """
-    Checks that all top-level directories have META.yml files.
-
-    :param repo_root: the repository root
-    :param paths: list of all paths
-    :returns: a list of errors found in ``paths``
-
-    """
-    # dirs represents whether there's a META.yml file, value is a boolean.
-    dirs = {}
-    errors = []
-    reviewer_in_subdirs = [
-        ".well-known",
-        "css",
-        "css/vendor-imports",
-    ]
-
-    for path in paths:
-        if os.name == "nt":
-            path = path.replace("\\", "/")
-
-        source_file = SourceFile(repo_root, path, "/")
-        if not source_file.dir_path:
-            continue  # Skip top-level files
-        parts = source_file.dir_path.split(os.path.sep)
-
-        level = 0
-        for dir in reviewer_in_subdirs:
-            if path.startswith(dir):
-                level = dir.count("/") + 1
-        if len(parts) <= level:
-            continue
-        key = "/".join(parts[:level + 1])
-        if key not in dirs:
-            dirs[key] = False
-        if path.endswith("/META.yml") and len(parts) == level + 1:
-            dirs[key] = True
-
-    for dir in dirs:
-        if dirs[dir] is False:
-            errors.append(("MISSING-META-YML", "Directory is missing META.yml file.", dir, None))
-
-    return errors
-
-
 def parse_whitelist(f):
     """
     Parse the whitelist file given by `f`, and return the parsed structure.
     """
 
     data = defaultdict(lambda:defaultdict(set))
     ignored_files = set()
 
@@ -467,55 +421,32 @@ def check_regexp_line(repo_root, path, f
 
     for i, line in enumerate(f):
         for regexp in applicable_regexps:
             if regexp.search(line):
                 errors.append((regexp.error, regexp.description, path, i+1))
 
     return errors
 
-meta_yml_extensions_pattern = re.compile(b"^[a-zA-z0-9_]+:$")
-meta_yml_item_pattern = re.compile(b"^  - [a-zA-Z0-9-]+$")
-
-def check_meta_yml_contents(repo_root, path, contents):
-    errors = []
-    for i, line in enumerate(contents.splitlines()):
-        if i == 0:
-            if line != b"suggested_reviewers:":
-                errors.append(("INVALID-META-YML", "First line was not `suggested_reviewers:`", path, i+1))
-        else:
-            if meta_yml_extensions_pattern.match(line):
-                break  # Allow extensions in META.yml without having to update the linter.
-            if not meta_yml_item_pattern.match(line):
-                errors.append(("INVALID-META-YML", "Expected item with username", path, i+1))
-
-    if i < 1:
-        errors.append(("INVALID-META-YML", "Expected item with username", path, i+1))
-
-    return errors
-
 def check_parsed(repo_root, path, f):
     source_file = SourceFile(repo_root, path, "/", contents=f.read())
 
     errors = []
 
     if path.startswith("css/"):
         if (source_file.type == "support" and
             not source_file.name_is_non_test and
             not source_file.name_is_reference):
             return [("SUPPORT-WRONG-DIR", "Support file not in support directory", path, None)]
 
         if (source_file.type != "support" and
             not source_file.name_is_reference and
             not source_file.spec_links):
             return [("MISSING-LINK", "Testcase file must have a link to a spec", path, None)]
 
-    if source_file.filename == "META.yml":
-        return check_meta_yml_contents(repo_root, path, source_file.contents)
-
     if source_file.name_is_non_test:
         return []
 
     if source_file.markup_type is None:
         return []
 
     if source_file.root is None:
         return [("PARSE-FAILED", "Unable to parse file", path, None)]
@@ -524,19 +455,17 @@ def check_parsed(repo_root, path, f):
         errors.append(("CONTENT-MANUAL", "Manual test whose filename doesn't end in '-manual'", path, None))
 
     if source_file.type == "visual" and not source_file.name_is_visual:
         errors.append(("CONTENT-VISUAL", "Visual test whose filename doesn't end in '-visual'", path, None))
 
     for reftest_node in source_file.reftest_nodes:
         href = reftest_node.attrib.get("href", "").strip(space_chars)
         parts = urlsplit(href)
-        if parts == urlsplit("about:blank"):
-            continue
-        if parts.scheme or parts.netloc:
+        if (parts.scheme or parts.netloc) and parts != urlsplit("about:blank"):
             errors.append(("ABSOLUTE-URL-REF",
                      "Reference test with a reference file specified via an absolute URL: '%s'" % href, path, None))
             continue
 
         ref_url = urljoin(source_file.url, href)
         ref_parts = urlsplit(ref_url)
 
         if source_file.url == ref_url:
@@ -968,17 +897,17 @@ def lint(repo_root, paths, output_format
     if output_format in ("normal", "markdown"):
         output_error_count(error_count)
         if error_count:
             for line in (ERROR_MSG % (last[0], last[1], last[0], last[1])).split("\n"):
                 logger.info(line)
     return sum(itervalues(error_count))
 
 path_lints = [check_path_length, check_worker_collision, check_ahem_copy]
-all_paths_lints = [check_css_globally_unique, check_meta_yml]
+all_paths_lints = [check_css_globally_unique]
 file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata]
 
 # Don't break users of the lint that don't have git installed.
 try:
     subprocess.check_output(["git", "--version"])
     all_paths_lints += [check_git_ignore]
 except subprocess.CalledProcessError:
     print('No git present; skipping .gitignore lint.')
rename from testing/web-platform/tests/tools/lint/tests/dummy/tests/broken.html
rename to testing/web-platform/tests/tools/lint/tests/dummy/broken.html
rename from testing/web-platform/tests/tools/lint/tests/dummy/tests/broken_ignored.html
rename to testing/web-platform/tests/tools/lint/tests/dummy/broken_ignored.html
deleted file mode 100644
--- a/testing/web-platform/tests/tools/lint/tests/dummy/css/css-unique/META.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-suggested_reviewers:
-  - gsnedders
rename from testing/web-platform/tests/tools/lint/tests/dummy/tests/dependency.html
rename to testing/web-platform/tests/tools/lint/tests/dummy/dependency.html
--- a/testing/web-platform/tests/tools/lint/tests/dummy/lint.whitelist
+++ b/testing/web-platform/tests/tools/lint/tests/dummy/lint.whitelist
@@ -1,1 +1,1 @@
-*:tests/broken_ignored.html
+*:broken_ignored.html
rename from testing/web-platform/tests/tools/lint/tests/dummy/tests/okay.html
rename to testing/web-platform/tests/tools/lint/tests/dummy/okay.html
deleted file mode 100644
--- a/testing/web-platform/tests/tools/lint/tests/dummy/ref/META.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-suggested_reviewers:
-  - gsnedders
--- a/testing/web-platform/tests/tools/lint/tests/dummy/ref/existent_root_relative.html
+++ b/testing/web-platform/tests/tools/lint/tests/dummy/ref/existent_root_relative.html
@@ -1,1 +1,1 @@
-<link rel="match" href="/tests/dependency.html">
+<link rel="match" href="/dependency.html">
deleted file mode 100644
--- a/testing/web-platform/tests/tools/lint/tests/dummy/tests/META.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-suggested_reviewers:
-  - zcorpan
deleted file mode 100644
--- a/testing/web-platform/tests/tools/lint/tests/dummy/tests/foo/META.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-suggested_reviewers:
-  - zcorpan
deleted file mode 100644
--- a/testing/web-platform/tests/tools/lint/tests/dummy/tests/foo/okay.html
+++ /dev/null
@@ -1,1 +0,0 @@
-OHOY
--- a/testing/web-platform/tests/tools/lint/tests/test_lint.py
+++ b/testing/web-platform/tests/tools/lint/tests/test_lint.py
@@ -110,405 +110,298 @@ def test_lint_no_files(caplog):
     rv = lint(_dummy_repo, [], "normal")
     assert rv == 0
     assert caplog.text == ""
 
 
 def test_lint_ignored_file(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/broken_ignored.html"], "normal")
+            rv = lint(_dummy_repo, ["broken_ignored.html"], "normal")
             assert rv == 0
             assert not mocked_check_path.called
             assert not mocked_check_file_contents.called
     assert caplog.text == ""
 
 
 def test_lint_not_existing_file(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
             # really long path-linted filename
-            name = "tests/a" * 256 + ".html"
+            name = "a" * 256 + ".html"
             rv = lint(_dummy_repo, [name], "normal")
             assert rv == 0
             assert not mocked_check_path.called
             assert not mocked_check_file_contents.called
     assert caplog.text == ""
 
 
 def test_lint_passing(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/okay.html",
-                                    "tests/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["okay.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert caplog.text == ""
 
 
 def test_lint_failing(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/broken.html",
-                                    "tests/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["broken.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "TRAILING WHITESPACE" in caplog.text
     assert "broken.html:1" in caplog.text
 
 
 def test_ref_existent_relative(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/existent_relative.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/existent_relative.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert caplog.text == ""
 
 
 def test_ref_existent_root_relative(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/existent_root_relative.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/existent_root_relative.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert caplog.text == ""
 
 
 def test_ref_non_existent_relative(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/non_existent_relative.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/non_existent_relative.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "NON-EXISTENT-REF" in caplog.text
     assert "ref/non_existent_relative.html" in caplog.text
     assert "non_existent_file.html" in caplog.text
 
 
 def test_ref_non_existent_root_relative(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/non_existent_root_relative.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/non_existent_root_relative.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "NON-EXISTENT-REF" in caplog.text
     assert "ref/non_existent_root_relative.html" in caplog.text
     assert "/non_existent_file.html" in caplog.text
 
 
 
 def test_ref_absolute_url(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/absolute.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/absolute.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "ABSOLUTE-URL-REF" in caplog.text
     assert "http://example.com/reference.html" in caplog.text
     assert "ref/absolute.html" in caplog.text
 
 
 def test_about_blank_as_ref(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/about_blank-ref.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["about_blank-ref.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert not mocked_check_path.called
+            assert not mocked_check_file_contents.called
     assert caplog.text == ""
 
 
 def test_ref_same_file_empty(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/same_file_empty.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/same_file_empty.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "SAME-FILE-REF" in caplog.text
     assert "same_file_empty.html" in caplog.text
 
 
 def test_ref_same_file_path(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["ref/same_file_path.html",
-                                    "ref/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["ref/same_file_path.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
     assert "SAME-FILE-REF" in caplog.text
     assert "same_file_path.html" in caplog.text
 
 
 def test_manual_path_testharness(caplog):
-    rv = lint(_dummy_repo, ["tests/relative-testharness-manual.html",
-                            "tests/META.yml"], "normal")
+    rv = lint(_dummy_repo, ["tests/relative-testharness-manual.html"], "normal")
     assert rv == 2
     assert "TESTHARNESS-PATH" in caplog.text
     assert "TESTHARNESSREPORT-PATH" in caplog.text
 
 
 def test_css_visual_path_testharness(caplog):
-    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness.html",
-                            "css/css-unique/META.yml"], "normal")
+    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness.html"], "normal")
     assert rv == 3
     assert "CONTENT-VISUAL" in caplog.text
     assert "TESTHARNESS-PATH" in caplog.text
     assert "TESTHARNESSREPORT-PATH" in caplog.text
 
 
 def test_css_manual_path_testharness(caplog):
-    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness-interact.html",
-                            "css/css-unique/META.yml"], "normal")
+    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness-interact.html"], "normal")
     assert rv == 3
     assert "CONTENT-MANUAL" in caplog.text
     assert "TESTHARNESS-PATH" in caplog.text
     assert "TESTHARNESSREPORT-PATH" in caplog.text
 
 
 def test_lint_passing_and_failing(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/broken.html",
-                                    "tests/okay.html",
-                                    "tests/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["broken.html", "okay.html"], "normal")
             assert rv == 1
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert "TRAILING WHITESPACE" in caplog.text
-    assert "tests/broken.html:1" in caplog.text
-    assert "tests/okay.html" not in caplog.text
+    assert "broken.html:1" in caplog.text
+    assert "okay.html" not in caplog.text
 
 
 def test_check_css_globally_unique_identical_test(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/match/a.html",
-                                    "css/css-unique/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/match/a.html", "css/css-unique/a.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_different_test(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/not-match/a.html",
-                                    "css/css-unique/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/not-match/a.html", "css/css-unique/a.html"], "normal")
             assert rv == 2
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert "CSS-COLLIDING-TEST-NAME" in caplog.text
 
 
 def test_check_css_globally_unique_different_spec_test(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/selectors/a.html",
-                                    "css/css-unique/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/selectors/a.html", "css/css-unique/a.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_support_ignored(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/support/a.html",
-                                    "css/css-unique/support/tools/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/support/a.html", "css/css-unique/support/tools/a.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_support_identical(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/support/a.html",
-                                    "css/css-unique/match/support/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/support/a.html", "css/css-unique/match/support/a.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_support_different(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/not-match/support/a.html",
-                                    "css/css-unique/support/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/not-match/support/a.html", "css/css-unique/support/a.html"], "normal")
             assert rv == 2
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert "CSS-COLLIDING-SUPPORT-NAME" in caplog.text
 
 
 def test_check_css_globally_unique_test_support(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/support/a.html",
-                                    "css/css-unique/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/support/a.html", "css/css-unique/a.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_ref_identical(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/a-ref.html",
-                                    "css/css-unique/match/a-ref.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/a-ref.html", "css/css-unique/match/a-ref.html"], "normal")
             assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
 def test_check_css_globally_unique_ref_different(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/not-match/a-ref.html",
-                                    "css/css-unique/a-ref.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/not-match/a-ref.html", "css/css-unique/a-ref.html"], "normal")
             assert rv == 2
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
+            assert mocked_check_path.call_count == 2
+            assert mocked_check_file_contents.call_count == 2
     assert "CSS-COLLIDING-REF-NAME" in caplog.text
 
 
 def test_check_css_globally_unique_test_ref(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/a-ref.html",
-                                    "css/css-unique/a.html",
-                                    "css/css-unique/META.yml"], "normal")
-            assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
-    assert caplog.text == ""
-
-
-def test_check_css_globally_unique_ignored(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/tools/a.html",
-                                    "css/css-unique/not-match/tools/a.html",
-                                    "css/css-unique/META.yml"], "normal")
-            assert rv == 0
-            assert mocked_check_path.call_count == 3
-            assert mocked_check_file_contents.call_count == 3
-    assert caplog.text == ""
-
-
-def test_check_css_globally_unique_ignored_dir(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["css/css-unique/support/a.html",
-                                    "css/css-unique/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/a-ref.html", "css/css-unique/a.html"], "normal")
             assert rv == 0
             assert mocked_check_path.call_count == 2
             assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
 
-# Test file            META.yml file       Errors
-# tests/okay.html      -                 1
-# tests/foo/okay.html  -                 1
-# tests/okay.html      tests/META.yml      0
-# tests/foo/okay.html  tests/META.yml      0
-# tests/okay.html      tests/foo/META.yml  1
-# tests/foo/okay.html  tests/foo/META.yml  1
-
-def test_check_meta_yml_test_l1_no_meta_yml(caplog):
+def test_check_css_globally_unique_ignored(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/okay.html"], "normal")
-            assert rv == 1
-            assert mocked_check_path.call_count == 1
-            assert mocked_check_file_contents.call_count == 1
-    assert "MISSING-META-YML" in caplog.text
-
-def test_check_meta_yml_test_l2_no_meta_yml(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/foo/okay.html"], "normal")
-            assert rv == 1
-            assert mocked_check_path.call_count == 1
-            assert mocked_check_file_contents.call_count == 1
-    assert "MISSING-META-YML" in caplog.text
-
-def test_check_meta_yml_test_l1_meta_yml_l1(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/okay.html",
-                                    "tests/META.yml"], "normal")
+            rv = lint(_dummy_repo, ["css/css-unique/tools/a.html", "css/css-unique/not-match/tools/a.html"], "normal")
             assert rv == 0
             assert mocked_check_path.call_count == 2
             assert mocked_check_file_contents.call_count == 2
     assert caplog.text == ""
 
-def test_check_meta_yml_test_l2_meta_yml_l1(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/foo/okay.html",
-                                    "tests/META.yml"], "normal")
-            assert rv == 0
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
-    assert caplog.text == ""
 
-def test_check_meta_yml_test_l1_meta_yml_l2(caplog):
+def test_check_css_globally_unique_ignored_dir(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/okay.html",
-                                    "tests/foo/META.yml"], "normal")
-            assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
-    assert "MISSING-META-YML" in caplog.text
-
-def test_check_meta_yml_test_l2_meta_yml_l2(caplog):
-    with _mock_lint("check_path") as mocked_check_path:
-        with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["tests/foo/okay.html",
-                                    "tests/foo/META.yml"], "normal")
-            assert rv == 1
-            assert mocked_check_path.call_count == 2
-            assert mocked_check_file_contents.call_count == 2
-    assert "MISSING-META-YML" in caplog.text
-
-
+            rv = lint(_dummy_repo, ["css/css-unique/support/a.html"], "normal")
+            assert rv == 0
+            assert mocked_check_path.call_count == 1
+            assert mocked_check_file_contents.call_count == 1
+    assert caplog.text == ""
 
 
 def test_all_filesystem_paths():
     with mock.patch(
             'os.walk',
             return_value=[('.',
                            ['dir_a', 'dir_b'],
                            ['file_a', 'file_b']),
--- a/testing/web-platform/tests/tools/manifest/sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/sourcefile.py
@@ -259,18 +259,16 @@ class SourceFile(object):
     @property
     def name_is_non_test(self):
         """Check if the file name matches the conditions for the file to
         be a non-test file"""
         return (self.is_dir() or
                 self.name_prefix("MANIFEST") or
                 self.filename == "META.yml" or
                 self.filename.startswith(".") or
-                self.filename == "OWNERS" or
-                self.filename == "META.yml" or
                 self.type_flag == "support" or
                 self.in_non_test_dir())
 
     @property
     def name_is_conformance(self):
         return (self.in_conformance_checker_dir() and
                 self.type_flag in ("is-valid", "no-valid"))