Title: [268983] trunk/Tools
- Revision
- 268983
- Author
- [email protected]
- Date
- 2020-10-26 10:29:49 -0700 (Mon, 26 Oct 2020)
Log Message
W3C test importer should not import manual HTTPS tests
https://bugs.webkit.org/show_bug.cgi?id=217944
Reviewed by Jonathan Bedard.
Uodate manual test detection heuristic to simply search for '-manual.'.
* Scripts/webkitpy/w3c/test_parser.py:
(TestParser.is_wpt_manualtest):
* Scripts/webkitpy/w3c/test_parser_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (268982 => 268983)
--- trunk/Tools/ChangeLog 2020-10-26 17:27:47 UTC (rev 268982)
+++ trunk/Tools/ChangeLog 2020-10-26 17:29:49 UTC (rev 268983)
@@ -1,3 +1,16 @@
+2020-10-26 Youenn Fablet <[email protected]>
+
+ W3C test importer should not import manual HTTPS tests
+ https://bugs.webkit.org/show_bug.cgi?id=217944
+
+ Reviewed by Jonathan Bedard.
+
+ Uodate manual test detection heuristic to simply search for '-manual.'.
+
+ * Scripts/webkitpy/w3c/test_parser.py:
+ (TestParser.is_wpt_manualtest):
+ * Scripts/webkitpy/w3c/test_parser_unittest.py:
+
2020-10-26 Zan Dobersek <[email protected]>
Remove Accelerated2dCanvasEnabled WebPreferences entry
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (268982 => 268983)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2020-10-26 17:27:47 UTC (rev 268982)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2020-10-26 17:29:49 UTC (rev 268983)
@@ -146,7 +146,7 @@
"""Returns whether the test is a manual test according WPT rules."""
# General rule for manual test i.e. file ends with -manual.htm path
# See https://web-platform-tests.org/writing-tests/manual.html#requirements-for-a-manual-test
- if self.filename.endswith('-manual.htm') or self.filename.endswith('-manual.html'):
+ if self.filename.find('-manual.') != -1:
return True
# Rule specific to CSS WG manual tests i.e. rely on <meta name="flags">
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py (268982 => 268983)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2020-10-26 17:27:47 UTC (rev 268982)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2020-10-26 17:29:49 UTC (rev 268983)
@@ -165,9 +165,16 @@
test_path = os.path.join(os.path.sep, 'some', 'madeup', 'path')
parser = TestParser(options, os.path.join(test_path, 'somefile-manual.html'))
test_info = parser.analyze_test(test_contents=test_html)
+ self.assertTrue(test_info['manualtest'], 'test_info is manual')
- self.assertTrue(test_info['manualtest'], 'test_info is None')
+ parser = TestParser(options, os.path.join(test_path, 'somefile-manual.https.html'))
+ test_info = parser.analyze_test(test_contents=test_html)
+ self.assertTrue(test_info['manualtest'], 'test_info is manual')
+ parser = TestParser(options, os.path.join(test_path, 'somefile-manual-https.html'))
+ test_info = parser.analyze_test(test_contents=test_html)
+ self.assertFalse('manualtest' in test_info.keys() and test_info['manualtest'], 'test_info is not manual')
+
def test_analyze_css_manual_test(self):
""" Tests analyze_test() using a css manual test """
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
