Attachment 361173 Details for Bug 194283 – Patch

[patch] Patch

bug-194283-20190205180611.patch (text/plain), 3.07 KB, created by Fujii Hironori on 2019-02-05 01:06:12 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-02-05 01:06:12 PST

Size: 3.07 KB

patch

obsolete

>Subversion Revision: 240958
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4ceee7b903e926e7fe0e19f6eae7b4795841ea2c..2114baf4ddf86aee35bfdc4917e10b7c30eab44d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-05  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 NOBODY (OOPS!).
>+
>+        * 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-02-04  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Precedence of booted devices should match precedence in DEFAULT_DEVICE_TYPES
>diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
>index 7be6d4847e50c36674adecfcda6cf9756f235532..6810d71a33f0e9c928b79fad16aceb4bc48ddd5c 100644
>--- a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
>@@ -241,6 +241,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',
>diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
>index 204644663e770eda41a76d49aab4b1b9f420f45e..d8af58a7a7df6d2e851abca5eba1aedbfd8f7701 100644
>--- a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
>@@ -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('')

Actions: View | Formatted Diff | Diff

Attachments on bug 194283: 361173 | 361901 | 385333