Changeset 137343 in webkit


Ignore:
Timestamp:
Dec 11, 2012 12:54:14 PM (11 years ago)
Author:
dpranke@chromium.org
Message:

nrwt isn't rejecting unrecognized expectations
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
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r137341 r137343  
     12012-12-11  Dirk Pranke  <dpranke@chromium.org>
     2
     3        nrwt isn't rejecting unrecognized expectations
     4        https://bugs.webkit.org/show_bug.cgi?id=104701
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Remove a few lines referring to non-existent files, and
     9        change a few "Fail" and "Text" expectations to "Failure" now
     10        that "Fail" and "Text" will be correctly rejected.
     11
     12        * platform/mac/TestExpectations
     13        * platform/qt/TestExpectations
     14        * platform/gtk/TestExpectations
     15        * platform/win/TestExpectations
     16
    1172012-12-11  Andreas Kling  <akling@apple.com>
    218
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r137310 r137343  
    704704webkit.org/b/50740 [ Release ] editing/spelling/spellcheck-queue.html [ Timeout ]
    705705
    706 Bug(GTK) media/progress-events-generated-correctly.html [ Timeout Text ]
     706Bug(GTK) media/progress-events-generated-correctly.html [ Failure Timeout ]
    707707
    708708webkit.org/b/102257 fast/dom/Window/open-window-min-size.html [ Timeout ]
  • trunk/LayoutTests/platform/mac/TestExpectations

    r137336 r137343  
    394394# https://bugs.webkit.org/show_bug.cgi?id=58924
    395395plugins/mouse-click-iframe-to-plugin.html
    396 
    397 # Animation API is disabled by default
    398 animations/animation-api-1.html
    399396
    400397# HTTP 204 (No Content) should be ignored
     
    12221219webkit.org/b/100846 inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html [ Skip ]
    12231220
    1224 webkit.org/b/100142 css3/filters/effect-reference-hw.html [ Fail ]
    1225 webkit.org/b/100142 css3/filters/effect-reference-ordering-hw.html [ Fail ]
    1226 webkit.org/b/100142 css3/filters/effect-reference.html [ Fail ]
     1221webkit.org/b/100142 css3/filters/effect-reference-hw.html [ Failure ]
     1222webkit.org/b/100142 css3/filters/effect-reference-ordering-hw.html [ Failure ]
     1223webkit.org/b/100142 css3/filters/effect-reference.html [ Failure ]
    12271224
    12281225# Mac doesn't have a toggle for CC any more, it's based on a menu of choices.
     
    12391236
    12401237# Needs ENABLE(MOUSE_CURSOR_SCALE)
    1241 webkit.org/b/102579 fast/css/cursor-parsing-image-set.html [ Fail ]
    1242 webkit.org/b/102579 fast/events/mouse-cursor-image-set.html [ Fail ]
     1238webkit.org/b/102579 fast/css/cursor-parsing-image-set.html [ Failure ]
     1239webkit.org/b/102579 fast/events/mouse-cursor-image-set.html [ Failure ]
    12431240
    12441241# Mountain Lion and prior do not allow access to in-band text tracks
  • trunk/LayoutTests/platform/qt/TestExpectations

    r137303 r137343  
    109109
    110110inspector/timeline/timeline-animation-frame.html
    111 
    112 # ENABLE(ANIMATION_API) is disabled.
    113 animations/animation-api-1.html
    114111
    115112# ENABLE(WEB_ARCHIVE) is disabled.
  • trunk/LayoutTests/platform/win/TestExpectations

    r137166 r137343  
    14711471http/tests/xmlhttprequest/basic-auth-nopassword.html
    14721472http/tests/xmlhttprequest/basic-auth-nouser.html
    1473 
    1474 # Animation API is disabled by default
    1475 animations/animation-api-1.html
    14761473
    14771474# HTTP 204 (No Content) should be ignored
  • trunk/Tools/ChangeLog

    r137338 r137343  
     12012-12-11  Dirk Pranke  <dpranke@chromium.org>
     2
     3        nrwt isn't rejecting unrecognized expectations
     4        https://bugs.webkit.org/show_bug.cgi?id=104701
     5
     6        Reviewed by Ojan Vafai.
     7
     8        NRWT is silently ignoring unrecognized expectations like "Text"
     9        and "Audio" (largely because I haven't fully removed support for
     10        the old syntax and keywords and restructured the code to do the
     11        proper checking). Temporarily change the tokenizer to reject
     12        unrecognized expectations until I can make those changes.
     13
     14        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
     15        (TestExpectationParser._tokenize_line):
     16        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
     17        (ExpectationSyntaxTests.test_unknown_expectation):
     18        (TestExpectationSerializationTests.disabled_test_string_whitespace_stripping):
     19
    1202012-12-11  Martin Robinson  <mrobinson@igalia.com>
    221
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

    r136580 r137343  
    330330                if token in ('Rebaseline', 'Skip', 'Slow', 'WontFix'):
    331331                    modifiers.append(token.upper())
     332                elif token not in cls._expectation_tokens:
     333                    warnings.append('Unrecognized expectation "%s"' % token)
    332334                else:
    333335                    expectations.append(cls._expectation_tokens.get(token, token))
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

    r136548 r137343  
    347347
    348348    def test_unknown_expectation(self):
    349         self.assert_tokenize_exp('foo.html [ Audio ]', expectations=['Audio'])
     349        self.assert_tokenize_exp('foo.html [ Audio ]', warnings=['Unrecognized expectation "Audio"'])
    350350
    351351    def test_skip(self):
     
    696696        self.assertEqual(serialized, "Bug(x) [ XP Release ] Yay [ ImageOnlyFailure ]\nNay")
    697697
    698     def test_string_whitespace_stripping(self):
     698    def disabled_test_string_whitespace_stripping(self):
     699        # FIXME: Re-enable this test once we rework the code to no longer support the old syntax.
    699700        self.assert_round_trip('\n', '')
    700701        self.assert_round_trip('  [ FOO ] bar [ BAZ ]', '[ FOO ] bar [ BAZ ]')
Note: See TracChangeset for help on using the changeset viewer.