nrwt isn't rejecting unrecognized expectations
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Dec 2012 20:54:14 +0000 (20:54 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Dec 2012 20:54:14 +0000 (20:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=104701

Reviewed by Ojan Vafai.

Tools:

NRWT is silently ignoring unrecognized expectations like "Text"
and "Audio" (largely because I haven't fully removed support for
the old syntax and keywords and restructured the code to do the
proper checking). Temporarily change the tokenizer to reject
unrecognized expectations until I can make those changes.

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectationParser._tokenize_line):
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
(ExpectationSyntaxTests.test_unknown_expectation):
(TestExpectationSerializationTests.disabled_test_string_whitespace_stripping):

LayoutTests:

Remove a few lines referring to non-existent files, and
change a few "Fail" and "Text" expectations to "Failure" now
that "Fail" and "Text" will be correctly rejected.

* platform/mac/TestExpectations
* platform/qt/TestExpectations
* platform/gtk/TestExpectations
* platform/win/TestExpectations

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

LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/qt/TestExpectations
LayoutTests/platform/win/TestExpectations
Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

index 19c8b11..ad77d80 100644 (file)
@@ -1,3 +1,19 @@
+2012-12-11  Dirk Pranke  <dpranke@chromium.org>
+
+        nrwt isn't rejecting unrecognized expectations
+        https://bugs.webkit.org/show_bug.cgi?id=104701
+
+        Reviewed by Ojan Vafai.
+
+        Remove a few lines referring to non-existent files, and
+        change a few "Fail" and "Text" expectations to "Failure" now
+        that "Fail" and "Text" will be correctly rejected.
+
+        * platform/mac/TestExpectations
+        * platform/qt/TestExpectations
+        * platform/gtk/TestExpectations
+        * platform/win/TestExpectations
+
 2012-12-11  Andreas Kling  <akling@apple.com>
 
         REGRESSION(r133492): Heap-use-after-free in WebCore::Element::normalizeAttributes
 2012-12-11  Andreas Kling  <akling@apple.com>
 
         REGRESSION(r133492): Heap-use-after-free in WebCore::Element::normalizeAttributes
index 9f6efe5..d6e5e62 100644 (file)
@@ -703,7 +703,7 @@ webkit.org/b/73003 [ Release ] editing/spelling/spellcheck-async.html [ Timeout
 webkit.org/b/73003 [ Release ] editing/spelling/spellcheck-paste.html [ Timeout ]
 webkit.org/b/50740 [ Release ] editing/spelling/spellcheck-queue.html [ Timeout ]
 
 webkit.org/b/73003 [ Release ] editing/spelling/spellcheck-paste.html [ Timeout ]
 webkit.org/b/50740 [ Release ] editing/spelling/spellcheck-queue.html [ Timeout ]
 
-Bug(GTK) media/progress-events-generated-correctly.html [ Timeout Text ]
+Bug(GTK) media/progress-events-generated-correctly.html [ Failure Timeout ]
 
 webkit.org/b/102257 fast/dom/Window/open-window-min-size.html [ Timeout ]
 
 
 webkit.org/b/102257 fast/dom/Window/open-window-min-size.html [ Timeout ]
 
index 87b2944..6f02384 100644 (file)
@@ -394,9 +394,6 @@ fast/dom/title-directionality.html
 # https://bugs.webkit.org/show_bug.cgi?id=58924
 plugins/mouse-click-iframe-to-plugin.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=58924
 plugins/mouse-click-iframe-to-plugin.html
 
-# Animation API is disabled by default
-animations/animation-api-1.html
-
 # HTTP 204 (No Content) should be ignored
 # https://bugs.webkit.org/show_bug.cgi?id=60206
 http/tests/navigation/response204.html
 # HTTP 204 (No Content) should be ignored
 # https://bugs.webkit.org/show_bug.cgi?id=60206
 http/tests/navigation/response204.html
@@ -1221,9 +1218,9 @@ platform/mac/tiled-drawing/ [ Skip ]
 webkit.org/b/100846 inspector-protocol/debugger-pause-dedicated-worker.html [ Skip ]
 webkit.org/b/100846 inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html [ Skip ]
 
 webkit.org/b/100846 inspector-protocol/debugger-pause-dedicated-worker.html [ Skip ]
 webkit.org/b/100846 inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html [ Skip ]
 
-webkit.org/b/100142 css3/filters/effect-reference-hw.html [ Fail ]
-webkit.org/b/100142 css3/filters/effect-reference-ordering-hw.html [ Fail ]
-webkit.org/b/100142 css3/filters/effect-reference.html [ Fail ]
+webkit.org/b/100142 css3/filters/effect-reference-hw.html [ Failure ]
+webkit.org/b/100142 css3/filters/effect-reference-ordering-hw.html [ Failure ]
+webkit.org/b/100142 css3/filters/effect-reference.html [ Failure ]
 
 # Mac doesn't have a toggle for CC any more, it's based on a menu of choices.
 webkit.org/b/101670 media/video-controls-captions.html [ Skip ]
 
 # Mac doesn't have a toggle for CC any more, it's based on a menu of choices.
 webkit.org/b/101670 media/video-controls-captions.html [ Skip ]
@@ -1238,8 +1235,8 @@ webkit.org/b/67434 [ Debug ] fast/block/float/overhanging-tall-block.html [ Skip
 Bug(jernoble) [ MountainLion Lion SnowLeopard ] media/video-src-blob.html
 
 # Needs ENABLE(MOUSE_CURSOR_SCALE)
 Bug(jernoble) [ MountainLion Lion SnowLeopard ] media/video-src-blob.html
 
 # Needs ENABLE(MOUSE_CURSOR_SCALE)
-webkit.org/b/102579 fast/css/cursor-parsing-image-set.html [ Fail ]
-webkit.org/b/102579 fast/events/mouse-cursor-image-set.html [ Fail ]
+webkit.org/b/102579 fast/css/cursor-parsing-image-set.html [ Failure ]
+webkit.org/b/102579 fast/events/mouse-cursor-image-set.html [ Failure ]
 
 # Mountain Lion and prior do not allow access to in-band text tracks
 webkit.org/b/103663 [ MountainLion Lion SnowLeopard ] media/track/track-in-band.html
 
 # Mountain Lion and prior do not allow access to in-band text tracks
 webkit.org/b/103663 [ MountainLion Lion SnowLeopard ] media/track/track-in-band.html
index eab9737..8c8825a 100644 (file)
@@ -109,9 +109,6 @@ http/tests/inspector/indexeddb
 
 inspector/timeline/timeline-animation-frame.html
 
 
 inspector/timeline/timeline-animation-frame.html
 
-# ENABLE(ANIMATION_API) is disabled.
-animations/animation-api-1.html
-
 # ENABLE(WEB_ARCHIVE) is disabled.
 svg/custom/image-with-prefix-in-webarchive.svg
 http/tests/webarchive
 # ENABLE(WEB_ARCHIVE) is disabled.
 svg/custom/image-with-prefix-in-webarchive.svg
 http/tests/webarchive
index 89c46ff..b7a1881 100644 (file)
@@ -1471,9 +1471,6 @@ media/invalid-media-url-crash.html
 http/tests/xmlhttprequest/basic-auth-nopassword.html
 http/tests/xmlhttprequest/basic-auth-nouser.html
 
 http/tests/xmlhttprequest/basic-auth-nopassword.html
 http/tests/xmlhttprequest/basic-auth-nouser.html
 
-# Animation API is disabled by default
-animations/animation-api-1.html
-
 # HTTP 204 (No Content) should be ignored
 # https://bugs.webkit.org/show_bug.cgi?id=60206
 http/tests/navigation/response204.html
 # HTTP 204 (No Content) should be ignored
 # https://bugs.webkit.org/show_bug.cgi?id=60206
 http/tests/navigation/response204.html
index 75c19bc..ef51383 100644 (file)
@@ -1,3 +1,22 @@
+2012-12-11  Dirk Pranke  <dpranke@chromium.org>
+
+        nrwt isn't rejecting unrecognized expectations
+        https://bugs.webkit.org/show_bug.cgi?id=104701
+
+        Reviewed by Ojan Vafai.
+
+        NRWT is silently ignoring unrecognized expectations like "Text"
+        and "Audio" (largely because I haven't fully removed support for
+        the old syntax and keywords and restructured the code to do the
+        proper checking). Temporarily change the tokenizer to reject
+        unrecognized expectations until I can make those changes.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        (TestExpectationParser._tokenize_line):
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+        (ExpectationSyntaxTests.test_unknown_expectation):
+        (TestExpectationSerializationTests.disabled_test_string_whitespace_stripping):
+
 2012-12-11  Martin Robinson  <mrobinson@igalia.com>
 
         Fix a typo in my previous commit that is causing test failures.
 2012-12-11  Martin Robinson  <mrobinson@igalia.com>
 
         Fix a typo in my previous commit that is causing test failures.
index 181875d..a6ffdcb 100644 (file)
@@ -329,6 +329,8 @@ class TestExpectationParser(object):
             elif state == 'expectations':
                 if token in ('Rebaseline', 'Skip', 'Slow', 'WontFix'):
                     modifiers.append(token.upper())
             elif state == 'expectations':
                 if token in ('Rebaseline', 'Skip', 'Slow', 'WontFix'):
                     modifiers.append(token.upper())
+                elif token not in cls._expectation_tokens:
+                    warnings.append('Unrecognized expectation "%s"' % token)
                 else:
                     expectations.append(cls._expectation_tokens.get(token, token))
             elif state == 'name_found':
                 else:
                     expectations.append(cls._expectation_tokens.get(token, token))
             elif state == 'name_found':
index 40f9cb5..b3b0aea 100644 (file)
@@ -346,7 +346,7 @@ class ExpectationSyntaxTests(Base):
         self.assert_tokenize_exp('[ Foo ] foo.html ', modifiers=['Foo', 'SKIP'], expectations=['PASS'])
 
     def test_unknown_expectation(self):
         self.assert_tokenize_exp('[ Foo ] foo.html ', modifiers=['Foo', 'SKIP'], expectations=['PASS'])
 
     def test_unknown_expectation(self):
-        self.assert_tokenize_exp('foo.html [ Audio ]', expectations=['Audio'])
+        self.assert_tokenize_exp('foo.html [ Audio ]', warnings=['Unrecognized expectation "Audio"'])
 
     def test_skip(self):
         self.assert_tokenize_exp('foo.html [ Skip ]', modifiers=['SKIP'], expectations=['PASS'])
 
     def test_skip(self):
         self.assert_tokenize_exp('foo.html [ Skip ]', modifiers=['SKIP'], expectations=['PASS'])
@@ -695,7 +695,8 @@ class TestExpectationSerializationTests(unittest.TestCase):
         serialized = TestExpectations.list_to_string(lines, self._converter, reconstitute_only_these=reconstitute_only_these)
         self.assertEqual(serialized, "Bug(x) [ XP Release ] Yay [ ImageOnlyFailure ]\nNay")
 
         serialized = TestExpectations.list_to_string(lines, self._converter, reconstitute_only_these=reconstitute_only_these)
         self.assertEqual(serialized, "Bug(x) [ XP Release ] Yay [ ImageOnlyFailure ]\nNay")
 
-    def test_string_whitespace_stripping(self):
+    def disabled_test_string_whitespace_stripping(self):
+        # FIXME: Re-enable this test once we rework the code to no longer support the old syntax.
         self.assert_round_trip('\n', '')
         self.assert_round_trip('  [ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]')
         self.assert_round_trip('[ FOO ]    bar [ BAZ ]', '[ FOO ] bar [ BAZ ]')
         self.assert_round_trip('\n', '')
         self.assert_round_trip('  [ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]')
         self.assert_round_trip('[ FOO ]    bar [ BAZ ]', '[ FOO ] bar [ BAZ ]')