webkit-patch print-expectations fails to format TestExpectationLine with DumpJSConsol...
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Dec 2019 01:49:54 +0000 (01:49 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Dec 2019 01:49:54 +0000 (01:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194283

Reviewed by Youenn Fablet.

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectationParser): Add DumpJSConsoleLogInStdErr to TestExpectationParser._expectation_tokens.
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
Added a tokenize test and round tip test for DumpJSConsoleLogInStdErr.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@253459 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 30cde82..d34bbfc 100644 (file)
@@ -1,3 +1,15 @@
+2019-12-12  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        webkit-patch print-expectations fails to format TestExpectationLine with DumpJSConsoleLogInStdErr
+        https://bugs.webkit.org/show_bug.cgi?id=194283
+
+        Reviewed by Youenn Fablet.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        (TestExpectationParser): Add DumpJSConsoleLogInStdErr to TestExpectationParser._expectation_tokens.
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+        Added a tokenize test and round tip test for DumpJSConsoleLogInStdErr.
+
 2019-12-12  Alex Christensen  <achristensen@webkit.org>
 
         Don't assert in HTTPServer::respondToRequests when connections fail
index 9fbf53e..abc32e7 100644 (file)
@@ -242,6 +242,7 @@ class TestExpectationParser(object):
     # FIXME: Update the original modifiers list and remove this once the old syntax is gone.
     _expectation_tokens = {
         'Crash': 'CRASH',
+        'DumpJSConsoleLogInStdErr': 'DUMPJSCONSOLELOGINSTDERR',
         'Failure': 'FAIL',
         'ImageOnlyFailure': 'IMAGE',
         'Leak': 'LEAK',
index 8a9ae74..c971204 100644 (file)
@@ -401,6 +401,9 @@ class ExpectationSyntaxTests(Base):
         self.assert_tokenize_exp('foo.html [ WontFix ImageOnlyFailure ]', modifiers=['WONTFIX'], expectations=['IMAGE'])
         self.assert_tokenize_exp('foo.html [ WontFix Pass Failure ]', modifiers=['WONTFIX'], expectations=['PASS', 'FAIL'])
 
+    def test_dump_js_console_log_in_stderr(self):
+        self.assert_tokenize_exp('foo.html [ DumpJSConsoleLogInStdErr ]', modifiers=['DUMPJSCONSOLELOGINSTDERR'], expectations=['PASS'])
+
     def test_blank_line(self):
         self.assert_tokenize_exp('', name=None)
 
@@ -710,6 +713,8 @@ class TestExpectationSerializationTests(unittest.TestCase):
         self.assert_round_trip('# Foo')
         self.assert_round_trip('# Foo :')
         self.assert_round_trip('# Foo : =')
+        self.assert_round_trip('foo [ Crash Skip WontFix ]')
+        self.assert_round_trip('foo [ DumpJSConsoleLogInStdErr Image ]')
 
     def test_list_roundtrip(self):
         self.assert_list_round_trip('')