webkitpy: Remove bug_dummy from parsed test expectations
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2019 00:45:39 +0000 (00:45 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2019 00:45:39 +0000 (00:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194562
<rdar://problem/47853999>

Reviewed by Lucas Forschler.

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectationParser):
(TestExpectationParser.expectation_for_skipped_test): Remove DUMMY_BUG_MODIFIER from
skipped tests.
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

index 31d7542..b80525d 100644 (file)
@@ -1,3 +1,17 @@
+2019-02-12  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Remove bug_dummy from parsed test expectations
+        https://bugs.webkit.org/show_bug.cgi?id=194562
+        <rdar://problem/47853999>
+
+        Reviewed by Lucas Forschler.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        (TestExpectationParser):
+        (TestExpectationParser.expectation_for_skipped_test): Remove DUMMY_BUG_MODIFIER from
+        skipped tests.
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+
 2019-02-12  Aakash Jain  <aakash_jain@apple.com>
 
         [ews-app] Add method to fetch patch
index 7be6d48..2587b0b 100644 (file)
@@ -78,7 +78,6 @@ class TestExpectationWarning(object):
 class TestExpectationParser(object):
     """Provides parsing facilities for lines in the test_expectation.txt file."""
 
-    DUMMY_BUG_MODIFIER = "bug_dummy"
     BUG_MODIFIER_PREFIX = 'bug'
     BUG_MODIFIER_REGEX = 'bug\d+'
     REBASELINE_MODIFIER = 'rebaseline'
@@ -117,7 +116,7 @@ class TestExpectationParser(object):
             _log.warning('The following test %s from the Skipped list doesn\'t exist' % test_name)
         expectation_line = TestExpectationLine()
         expectation_line.original_string = test_name
-        expectation_line.modifiers = [TestExpectationParser.DUMMY_BUG_MODIFIER, TestExpectationParser.SKIP_MODIFIER]
+        expectation_line.modifiers = [TestExpectationParser.SKIP_MODIFIER]
         # FIXME: It's not clear what the expectations for a skipped test should be; the expectations
         # might be different for different entries in a Skipped file, or from the command line, or from
         # only running parts of the tests. It's also not clear if it matters much.
index 2046446..8a9ae74 100644 (file)
@@ -298,9 +298,9 @@ class SkippedTests(Base):
         exp = TestExpectations(port, ['failures/expected/text.html'], expectations_to_lint=expectations_to_lint)
         exp.parse_all_expectations()
 
-        # Check that the expectation is for BUG_DUMMY SKIP : ... [ Pass ]
+        # Check that the expectation is for SKIP : ... [ Pass ]
         self.assertEqual(exp.model().get_modifiers('failures/expected/text.html'),
-                          [TestExpectationParser.DUMMY_BUG_MODIFIER, TestExpectationParser.SKIP_MODIFIER, TestExpectationParser.WONTFIX_MODIFIER])
+                          [TestExpectationParser.SKIP_MODIFIER, TestExpectationParser.WONTFIX_MODIFIER])
         self.assertEqual(exp.model().get_expectations('failures/expected/text.html'), set([PASS]))
 
     def test_skipped_tests_work(self):