Bug 1494849 [wpt PR 13251] - Consider .headers files as non tests, a=testonly
authorqiuzhong <zhongx.qiu@intel.com>
Fri, 05 Oct 2018 14:20:52 +0000
changeset 495792 9c5e413320748dd2b3ac3c355f68ff732ca1d760
parent 495791 3deb88309435b74a88ea886a0a076f0d6c84631c
child 495793 563469d5ab547480dee62e89dc7ea9c780ba44e2
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1494849, 13251, 12880
milestone64.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 1494849 [wpt PR 13251] - Consider .headers files as non tests, a=testonly Automatic update from web-platform-testsConsider .headers files as non tests Consider all the .headers files as non tests so the files like "foo-manual.html.headers" will be classified into the support ones. Fix: #12880 -- wpt-commits: 0637d070d5cc9aa55c3eb0d07119802f9370893a wpt-pr: 13251
testing/web-platform/tests/tools/manifest/sourcefile.py
testing/web-platform/tests/tools/manifest/tests/test_sourcefile.py
--- a/testing/web-platform/tests/tools/manifest/sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/sourcefile.py
@@ -262,16 +262,17 @@ 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.endswith(".headers") 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"))
 
--- a/testing/web-platform/tests/tools/manifest/tests/test_sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/tests/test_sourcefile.py
@@ -31,16 +31,17 @@ def items(s):
     "conformance-checkers/test.html",
     "conformance-checkers/README.md",
     "conformance-checkers/html/Makefile",
     "conformance-checkers/html/test.html",
     "foo/tools/test.html",
     "foo/resources/test.html",
     "foo/support/test.html",
     "foo/test-support.html",
+    "foo/foo-manual.html.headers",
     "css/common/test.html",
     "css/CSS2/archive/test.html",
 ])
 def test_name_is_non_test(rel_path):
     s = create(rel_path)
     assert s.name_is_non_test or s.name_is_conformance_support
 
     assert not s.content_is_testharness
@@ -59,16 +60,17 @@ def test_name_is_non_test(rel_path):
 def test_not_name_is_non_test(rel_path):
     s = create(rel_path)
     assert not (s.name_is_non_test or s.name_is_conformance_support)
     # We aren't actually asserting what type of test these are, just their
     # name doesn't prohibit them from being tests.
 
 
 @pytest.mark.parametrize("rel_path", [
+    "foo/foo-manual.html",
     "html/test-manual.html",
     "html/test-manual.xhtml",
     "html/test-manual.https.html",
     "html/test-manual.https.xhtml"
 ])
 def test_name_is_manual(rel_path):
     s = create(rel_path)
     assert not s.name_is_non_test