Changeset 70590 in webkit


Ignore:
Timestamp:
Oct 26, 2010 5:08:40 PM (14 years ago)
Author:
ojan@chromium.org
Message:

2010-10-26 Ojan Vafai <​ojan@chromium.org>

Reviewed by Tony Chang.

remove DEFER support from new-run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=48387

DEFER was needed when we were trying to ship Chrome beta.
Now it's just extra complication.

  • Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
  • Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
  • Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py:
  • Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:
  • Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
Location:
trunk/WebKitTools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r70586 r70590  
     12010-10-26  Ojan Vafai  <ojan@chromium.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        remove DEFER support from new-run-webkit-tests
     6        https://bugs.webkit.org/show_bug.cgi?id=48387
     7
     8        DEFER was needed when we were trying to ship Chrome beta.
     9        Now it's just extra complication.
     10
     11        * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
     12        * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
     13        * Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py:
     14        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
     15        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     16        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
     17
    1182010-10-26  Eric Seidel  <eric@webkit.org>
    219

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py

    r65574 r70590  
    4343    # Additional JSON fields.
    4444    WONTFIX = "wontfixCounts"
    45     DEFERRED = "deferredCounts"
    4645
    4746    # Note that we omit test_expectations.FAIL from this list because
    … …  
    167166            len(self._expectations.get_tests_with_timeline(
    168167                test_expectations.NOW)), self.ALL_FIXABLE_COUNT)
    169         self._insert_item_into_raw_list(results_for_builder,
    170             self._get_failure_summary_entry(test_expectations.DEFER),
    171             self.DEFERRED)
    172168        self._insert_item_into_raw_list(results_for_builder,
    173169            self._get_failure_summary_entry(test_expectations.WONTFIX),

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py

    r67974 r70590  
    4444# Test expectation and modifier constants.
    4545(PASS, FAIL, TEXT, IMAGE, IMAGE_PLUS_TEXT, TIMEOUT, CRASH, SKIP, WONTFIX,
    46  DEFER, SLOW, REBASELINE, MISSING, FLAKY, NOW, NONE) = range(16)
     46 SLOW, REBASELINE, MISSING, FLAKY, NOW, NONE) = range(15)
    4747
    4848# Test expectation file update action constants
    … …  
    229229      DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
    230230      LINUX DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
    231       DEFER LINUX WIN : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
     231      LINUX WIN : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
    232232
    233233    SKIP: Doesn't run the test.
    234234    SLOW: The test takes a long time to run, but does not timeout indefinitely.
    235235    WONTFIX: For tests that we never intend to pass on a given platform.
    236     DEFER: Test does not count in our statistics for the current release.
    237236    DEBUG: Expectations apply only to the debug build.
    238237    RELEASE: Expectations apply only to release build.
    … …  
    242241    Notes:
    243242      -A test cannot be both SLOW and TIMEOUT
    244       -A test cannot be both DEFER and WONTFIX
    245243      -A test should only be one of IMAGE, TEXT, IMAGE+TEXT, or FAIL. FAIL is
    246244       a migratory state that currently means either IMAGE, TEXT, or
    … …  
    250248      -A test can be included twice, but not via the same path.
    251249      -If a test is included twice, then the more precise path wins.
    252       -CRASH tests cannot be DEFER or WONTFIX
     250      -CRASH tests cannot be WONTFIX
    253251    """
    254252
    … …  
    283281    MODIFIERS = {'skip': SKIP,
    284282                 'wontfix': WONTFIX,
    285                  'defer': DEFER,
    286283                 'slow': SLOW,
    287284                 'rebaseline': REBASELINE,
    … …  
    289286
    290287    TIMELINES = {'wontfix': WONTFIX,
    291                  'now': NOW,
    292                  'defer': DEFER}
     288                 'now': NOW}
    293289
    294290    RESULT_TYPES = {'skip': SKIP,
    … …  
    622618                return False
    623619
    624         if 'wontfix' in options and 'defer' in options:
    625             self._add_error(lineno, 'Test cannot be both DEFER and WONTFIX.',
    626                 test_and_expectations)
    627 
    628620        if self._is_lint_mode and 'rebaseline' in options:
    629621            self._add_error(lineno,
    … …  
    774766        if 'wontfix' in modifiers:
    775767            self._timeline_to_tests[WONTFIX].add(test)
    776         elif 'defer' in modifiers:
    777             self._timeline_to_tests[DEFER].add(test)
    778768        else:
    779769            self._timeline_to_tests[NOW].add(test)

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py

    r67974 r70590  
    135135            set([TEXT, CRASH]))
    136136
    137     def test_defer(self):
    138         self.parse_exp('BUGX DEFER : failures/expected/text.html = TEXT')
    139         self.assertEqual(self._exp.get_options(
    140             self.get_test('failures/expected/text.html')), ['bugx', 'defer'])
    141 
    142137    def test_precedence(self):
    143138        # This tests handling precedence of specific lines over directories
    … …  
    145140        exp_str = """
    146141BUGX : failures/expected/text.html = TEXT
    147 BUGX DEFER : failures/expected = IMAGE
     142BUGX WONTFIX : failures/expected = IMAGE
    148143"""
    149144        self.parse_exp(exp_str)
    … …  
    228223            'BUG_TEST SLOW : failures/expected/timeout.html = TIMEOUT')
    229224
    230     def test_semantic_wontfix_defer(self):
    231         # A test cannot be WONTFIX and DEFER.
    232         self.assertRaises(SyntaxError, self.parse_exp,
    233             'BUG_TEST WONTFIX DEFER : failures/expected/text.html = TEXT')
    234 
    235225    def test_semantic_rebaseline(self):
    236226        # Can't lint a file w/ 'REBASELINE' in it.

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

    r70013 r70590  
    122122
    123123        port.test_expectations = lambda: """BUG_TEST SKIP : fast/js/not-good.js = TEXT
    124 DEFER LINUX WIN : fast/js/very-good.js = TIMEOUT PASS"""
     124LINUX WIN : fast/js/very-good.js = TIMEOUT PASS"""
    125125        port.test_expectations_overrides = lambda: ''
    126126        port.tests = lambda paths: set()

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

    r70458 r70590  
    10121012        now = result_summary.tests_by_timeline[test_expectations.NOW]
    10131013        wontfix = result_summary.tests_by_timeline[test_expectations.WONTFIX]
    1014         defer = result_summary.tests_by_timeline[test_expectations.DEFER]
    10151014
    10161015        # We use a fancy format string in order to print the data out in a
    10171016        # nicely-aligned table.
    1018         fmtstr = ("Expect: %%5d %%-8s (%%%dd now, %%%dd defer, %%%dd wontfix)"
    1019                   % (self._num_digits(now), self._num_digits(defer),
    1020                   self._num_digits(wontfix)))
     1017        fmtstr = ("Expect: %%5d %%-8s (%%%dd now, %%%dd wontfix)"
     1018                  % (self._num_digits(now), self._num_digits(wontfix)))
    10211019        self._printer.print_expected(fmtstr %
    1022             (len(tests), result_type_str, len(tests & now),
    1023              len(tests & defer), len(tests & wontfix)))
     1020            (len(tests), result_type_str, len(tests & now), len(tests & wontfix)))
    10241021
    10251022    def _num_digits(self, num):
    … …  
    12421239        self._printer.print_actual("")
    12431240        self._print_result_summary_entry(result_summary,
    1244             test_expectations.NOW, "Tests to be fixed for the current release")
    1245 
    1246         self._printer.print_actual("")
    1247         self._print_result_summary_entry(result_summary,
    1248             test_expectations.DEFER,
    1249             "Tests we'll fix in the future if they fail (DEFER)")
     1241            test_expectations.NOW, "Tests to be fixed")
    12501242
    12511243        self._printer.print_actual("")

  • trunk/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

    r66125 r70590  
    112112            "")
    113113        self.assert_lines_lint(
    114             ["SLOW DEFER BUG1234 : passes/text.html = PASS"],
     114            ["SLOW BUG1234 : passes/text.html = PASS"],
    115115            "")
    116116        self.assert_lines_lint(
    … …  
    127127            "Test lacks BUG modifier. "
    128128            "passes/text.html  [test/expectations] [2]")
    129         self.assert_lines_lint(
    130             ["WONTFIX DEFER : passes/text.html = PASS"],
    131             "Test cannot be both DEFER and WONTFIX. "
    132             "passes/text.html  [test/expectations] [5]")
    133129
    134130    def test_expectation_errors(self):
Note: See TracChangeset for help on using the changeset viewer.