Changeset 92634 in webkit


Ignore:
Timestamp:
Aug 8, 2011 2:28:03 PM (13 years ago)
Author:
Dimitri Glazkov
Message:

TestExpectationsEditor should return a list of updated expectations.
https://bugs.webkit.org/show_bug.cgi?id=65872

Reviewed by Adam Barth.

  • Scripts/webkitpy/layout_tests/models/test_expectations.py: Added a list to store lines that are being updated.
  • Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Changed tests to account for updated lines.
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r92632 r92634  
     12011-08-08  Dimitri Glazkov  <dglazkov@chromium.org>
     2
     3        TestExpectationsEditor should return a list of updated expectations.
     4        https://bugs.webkit.org/show_bug.cgi?id=65872
     5
     6        Reviewed by Adam Barth.
     7
     8        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Added a list to store lines that are being updated.
     9        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Changed tests to account for updated lines.
     10
    1112011-08-08  Jochen Eisinger  <jochen@chromium.org>
    212
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

    r92493 r92634  
    642642        """
    643643        # FIXME: Allow specifying modifiers (SLOW, SKIP, WONTFIX).
     644        updated_expectations = []
    644645        expectation_lines = self._test_to_expectation_lines.get(test, [])
    645646        remaining_configurations = test_config_set.copy()
     
    650651                # Tweak expectations on existing line.
    651652                if expectation_line.parsed_expectations == expectation_set:
    652                     return
     653                    return updated_expectations
    653654                self._bug_manager.close_bug(expectation_line.parsed_bug_modifiers, bug_ids)
     655                updated_expectations.append(expectation_line)
    654656                if remove_expectations:
    655657                    expectation_line.matching_configurations = set()
    656                     return
    657                 expectation_line.parsed_expectations = expectation_set
    658                 expectation_line.parsed_bug_modifiers = bug_ids
    659                 return
     658                else:
     659                    expectation_line.parsed_expectations = expectation_set
     660                    expectation_line.parsed_bug_modifiers = bug_ids
     661                return updated_expectations
    660662            elif expectation_line.matching_configurations >= remaining_configurations:
    661663                # 1) Split up into two expectation lines:
     
    664666                # 2) Finish looking, since there will be no more remaining configs to test for.
    665667                expectation_line.matching_configurations -= remaining_configurations
     668                updated_expectations.append(expectation_line)
    666669                break
    667670            elif expectation_line.matching_configurations <= remaining_configurations:
     
    669672                self._bug_manager.close_bug(expectation_line.parsed_bug_modifiers, bug_ids)
    670673                expectation_line.matching_configurations = set()
     674                updated_expectations.append(expectation_line)
    671675            else:
    672676                intersection = expectation_line.matching_configurations & remaining_configurations
    673677                if intersection:
    674678                    expectation_line.matching_configurations -= intersection
     679                    updated_expectations.append(expectation_line)
    675680
    676681        if not remove_expectations:
    677             self._expectation_lines.append(self._create_new_line(test, bug_ids, remaining_configurations, expectation_set))
     682            new_expectation_line = self._create_new_line(test, bug_ids, remaining_configurations, expectation_set)
     683            updated_expectations.append(new_expectation_line)
     684            self._expectation_lines.append(new_expectation_line)
     685
     686        return updated_expectations
    678687
    679688    def _get_valid_bug_ids(self, suggested_bug_ids):
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

    r92317 r92634  
    634634        self.assertEquals(result, expected_string)
    635635
    636     def assert_update_roundtrip(self, in_string, test, expectation_set, expected_string, remove_flakes=False, parsed_bug_modifiers=None, test_configs=None):
     636    def assert_update_roundtrip(self, in_string, test, expectation_set, expected_string, expected_update_count, remove_flakes=False, parsed_bug_modifiers=None, test_configs=None):
    637637        test_config_set = test_configs or set([self.test_port.test_configuration()])
    638638        expectation_lines = self.make_parsed_expectation_lines(in_string)
    639639        editor = TestExpectationsEditor(expectation_lines, MockBugManager())
    640         editor.update_expectation(test, test_config_set, expectation_set, parsed_bug_modifiers=parsed_bug_modifiers)
     640        updated_expectation_lines = editor.update_expectation(test, test_config_set, expectation_set, parsed_bug_modifiers=parsed_bug_modifiers)
     641        for updated_expectation_line in updated_expectation_lines:
     642            self.assertTrue(updated_expectation_line in expectation_lines)
     643        self.assertEquals(len(updated_expectation_lines), expected_update_count)
    641644        converter = TestConfigurationConverter(self.test_port.all_test_configurations(), self.test_port.configuration_specifier_macros())
    642645        result = TestExpectationSerializer.list_to_string(expectation_lines, converter)
     
    779782        self.assert_update_roundtrip("""
    780783BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    781 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""")
    782 
    783         self.assert_update_roundtrip("""
    784 BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([PASS]), '')
     784BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 1)
     785
     786        self.assert_update_roundtrip("""
     787BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([PASS]), '', 1)
    785788
    786789        self.assert_update_roundtrip("""
    787790BUGX1 XP RELEASE CPU : failures/expected = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    788791BUGX1 XP RELEASE CPU : failures/expected = TEXT
    789 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""")
     792BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 1)
    790793
    791794        self.assert_update_roundtrip("""
    792795BUGX1 XP RELEASE CPU : failures/expected = TEXT""", 'failures/expected/keyboard.html', set([PASS]), """
    793796BUGX1 XP RELEASE CPU : failures/expected = TEXT
    794 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = PASS""")
     797BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = PASS""", 1)
    795798
    796799        self.assert_update_roundtrip("""
    797800BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([TEXT]), """
    798 BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""")
     801BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 0)
    799802
    800803        self.assert_update_roundtrip("""
    801804BUGX1 XP RELEASE CPU : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    802 BUGAWESOME XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", parsed_bug_modifiers=['BUGAWESOME'])
     805BUGAWESOME XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 1, parsed_bug_modifiers=['BUGAWESOME'])
    803806
    804807        self.assert_update_roundtrip("""
    805808BUGX1 XP RELEASE : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    806809BUGX1 XP RELEASE GPU : failures/expected/keyboard.html = TEXT
    807 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""")
     810BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2)
    808811
    809812        self.assert_update_roundtrip("""
    810813BUGX1 XP RELEASE : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([PASS]), """
    811 BUGX1 XP RELEASE GPU : failures/expected/keyboard.html = TEXT""")
     814BUGX1 XP RELEASE GPU : failures/expected/keyboard.html = TEXT""", 1)
    812815
    813816        self.assert_update_roundtrip("""
    814817BUGX1 XP RELEASE : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    815818BUGX1 XP RELEASE GPU : failures/expected/keyboard.html = TEXT
    816 BUGAWESOME XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", parsed_bug_modifiers=['BUGAWESOME'])
     819BUGAWESOME XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2, parsed_bug_modifiers=['BUGAWESOME'])
    817820
    818821        self.assert_update_roundtrip("""
     
    821824BUGX1 XP GPU : failures/expected/keyboard.html = TEXT
    822825BUGX1 VISTA WIN7 : failures/expected/keyboard.html = TEXT
    823 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""")
     826BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2)
    824827
    825828        self.assert_update_roundtrip("""
     
    827830BUGX1 XP DEBUG CPU : failures/expected/keyboard.html = TEXT
    828831BUGX1 XP GPU : failures/expected/keyboard.html = TEXT
    829 BUGX1 VISTA WIN7 : failures/expected/keyboard.html = TEXT""")
     832BUGX1 VISTA WIN7 : failures/expected/keyboard.html = TEXT""", 1)
    830833
    831834        self.assert_update_roundtrip("""
     
    834837BUGX1 XP GPU : failures/expected/keyboard.html = TEXT
    835838BUGX1 VISTA WIN7 : failures/expected/keyboard.html = TEXT
    836 BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""")
     839BUG_NEWLY_CREATED XP RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2)
    837840
    838841        self.assert_update_roundtrip("""
    839842BUGX1 XP RELEASE CPU: failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    840 BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", test_configs=self.WIN_RELEASE_CPU_CONFIGS)
    841 
    842         self.assert_update_roundtrip("""
    843 BUGX1 XP RELEASE CPU: failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([PASS]), '', test_configs=self.WIN_RELEASE_CPU_CONFIGS)
     843BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2, test_configs=self.WIN_RELEASE_CPU_CONFIGS)
     844
     845        self.assert_update_roundtrip("""
     846BUGX1 XP RELEASE CPU: failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([PASS]), '', 1, test_configs=self.WIN_RELEASE_CPU_CONFIGS)
    844847
    845848        self.assert_update_roundtrip("""
    846849BUGX1 RELEASE CPU: failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    847850BUGX1 LINUX MAC RELEASE CPU : failures/expected/keyboard.html = TEXT
    848 BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", test_configs=self.WIN_RELEASE_CPU_CONFIGS)
     851BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 2, test_configs=self.WIN_RELEASE_CPU_CONFIGS)
    849852
    850853        self.assert_update_roundtrip("""
    851854BUGX1 MAC : failures/expected/keyboard.html = TEXT""", 'failures/expected/keyboard.html', set([IMAGE]), """
    852855BUGX1 MAC : failures/expected/keyboard.html = TEXT
    853 BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", test_configs=self.WIN_RELEASE_CPU_CONFIGS)
     856BUG_NEWLY_CREATED WIN RELEASE CPU : failures/expected/keyboard.html = IMAGE""", 1, test_configs=self.WIN_RELEASE_CPU_CONFIGS)
    854857
    855858    def test_update_expectation_multiple(self):
Note: See TracChangeset for help on using the changeset viewer.