Commit c5806d81 authored by Luke Zielinski's avatar Luke Zielinski Committed by Commit Bot

Update WPT metadata builder to use the `blink_expect_any_subtest_status` metadata key.

This allows us to mark any subtest failures as expected without
enumerating all of them.

Bug: 937369
Change-Id: I34a7d300a1ea3bd36f91f02f1cc33115644d1468
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917682Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Auto-Submit: Luke Z <lpz@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716041}
parent d4b6d7ef
...@@ -204,4 +204,4 @@ class WPTMetadataBuilder(object): ...@@ -204,4 +204,4 @@ class WPTMetadataBuilder(object):
return "[%s]\n disabled: wpt_metadata_builder.py\n" % test_name return "[%s]\n disabled: wpt_metadata_builder.py\n" % test_name
def _get_test_failed_string(self, test_name): def _get_test_failed_string(self, test_name):
return "[%s]\n expected: FAIL # wpt_metadata_builder.py\n" % test_name return "[%s]\n blink_expect_any_subtest_status: True # wpt_metadata_builder.py\n" % test_name
...@@ -141,7 +141,9 @@ class WPTMetadataBuilderTest(unittest.TestCase): ...@@ -141,7 +141,9 @@ class WPTMetadataBuilderTest(unittest.TestCase):
metadata_builder = WPTMetadataBuilder(expectations, self.port) metadata_builder = WPTMetadataBuilder(expectations, self.port)
filename, contents = metadata_builder.get_metadata_filename_and_contents(test_name, 'FAIL') filename, contents = metadata_builder.get_metadata_filename_and_contents(test_name, 'FAIL')
self.assertEqual(os.path.join("dir", "zzzz.html.ini"), filename) self.assertEqual(os.path.join("dir", "zzzz.html.ini"), filename)
self.assertEqual("[zzzz.html]\n expected: FAIL # wpt_metadata_builder.py\n", contents) self.assertEqual(
"[zzzz.html]\n blink_expect_any_subtest_status: True # wpt_metadata_builder.py\n",
contents)
def test_wpt_test_with_passing_baseline(self): def test_wpt_test_with_passing_baseline(self):
"""A WPT test with an all-pass baseline doesn't get metadata.""" """A WPT test with an all-pass baseline doesn't get metadata."""
...@@ -172,4 +174,6 @@ class WPTMetadataBuilderTest(unittest.TestCase): ...@@ -172,4 +174,6 @@ class WPTMetadataBuilderTest(unittest.TestCase):
# which in this case is the js file from the manifest. # which in this case is the js file from the manifest.
self.assertEqual(os.path.join("dir", "multiglob.https.any.js.ini"), filename) self.assertEqual(os.path.join("dir", "multiglob.https.any.js.ini"), filename)
# The metadata contents contains the *test name* # The metadata contents contains the *test name*
self.assertEqual("[multiglob.https.any.window.html]\n expected: FAIL # wpt_metadata_builder.py\n", contents) self.assertEqual(
"[multiglob.https.any.window.html]\n blink_expect_any_subtest_status: True # wpt_metadata_builder.py\n",
contents)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment