Changeset 93562 in webkit

Timestamp:

Aug 22, 2011 4:53:19 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

webkit-patch rebaseline-expectations command should not rearrange the entire test_expectations.txt file.
​https://bugs.webkit.org/show_bug.cgi?id=66727

Reviewed by Adam Barth.

• Scripts/webkitpy/layout_tests/models/test_expectations.py: Made it possible to run TestExpectationSerializer without a TestConfigurationConverter,

in which case the serializer treats all expectations as unparsed.

• Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Added unit tests.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-22  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        webkit-patch rebaseline-expectations command should not rearrange the entire test_expectations.txt file.
+        https://bugs.webkit.org/show_bug.cgi?id=66727
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Made it possible to run TestExpectationSerializer without a TestConfigurationConverter,
+            in which case the serializer treats all expectations as unparsed.
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Added unit tests.
+
 2011-08-22  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -122 +122 @@
 class TestExpectationSerializer(object):
     """Provides means of serializing TestExpectationLine instances."""
-    def __init__(self, test_configuration_converter):
+    def __init__(self, test_configuration_converter=None):
         self._test_configuration_converter = test_configuration_converter
         self._parsed_expectation_to_string = dict([[parsed_expectation, expectation_string] for expectation_string, parsed_expectation in TestExpectations.EXPECTATIONS.items()])
@@ -133 +133 @@
             return '' if expectation_line.comment is None else "//%s" % expectation_line.comment
 
-        if expectation_line.parsed_bug_modifiers:
+        if self._test_configuration_converter and expectation_line.parsed_bug_modifiers:
             specifiers_list = self._test_configuration_converter.to_specifiers_list(expectation_line.matching_configurations)
             result = []
@@ -152 +152 @@
 
     def _parsed_modifier_string(self, expectation_line, specifiers):
+        assert(self._test_configuration_converter)
         result = []
         if expectation_line.parsed_bug_modifiers:
@@ -167 +168 @@
 
     @classmethod
-    def list_to_string(cls, expectation_lines, test_configuration_converter, reconstitute_only_these=None):
+    def list_to_string(cls, expectation_lines, test_configuration_converter=None, reconstitute_only_these=None):
         serializer = cls(test_configuration_converter)
 
@@ -931 +932 @@
         return self._has_warnings
 
-    def remove_rebaselined_tests(self, tests):
+    def remove_rebaselined_tests(self, except_these_tests):
         """Returns a copy of the expectations with the tests removed."""
         def without_rebaseline_modifier(expectation):
-            return not (not expectation.is_malformed() and expectation.name in tests and "rebaseline" in expectation.modifiers)
-
-        return TestExpectationSerializer.list_to_string(filter(without_rebaseline_modifier, self._expectations), self._test_configuration_converter)
+            return not (not expectation.is_malformed() and expectation.name in except_these_tests and "rebaseline" in expectation.modifiers)
+
+        return TestExpectationSerializer.list_to_string(filter(without_rebaseline_modifier, self._expectations))
 
     def _add_expectations(self, expectation_list, overrides_allowed):

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

@@ -483 +483 @@
     def test_unparsed_to_string(self):
         expectation = TestExpectationLine()
-
-        self.assertEqual(self._serializer.to_string(expectation), '')
+        serializer = TestExpectationSerializer()
+
+        self.assertEqual(serializer.to_string(expectation), '')
         expectation.comment = 'Qux.'
-        self.assertEqual(self._serializer.to_string(expectation), '//Qux.')
+        self.assertEqual(serializer.to_string(expectation), '//Qux.')
         expectation.name = 'bar'
-        self.assertEqual(self._serializer.to_string(expectation), ' : bar =  //Qux.')
+        self.assertEqual(serializer.to_string(expectation), ' : bar =  //Qux.')
         expectation.modifiers = ['foo']
-        self.assertEqual(self._serializer.to_string(expectation), 'FOO : bar =  //Qux.')
+        self.assertEqual(serializer.to_string(expectation), 'FOO : bar =  //Qux.')
         expectation.expectations = ['bAz']
-        self.assertEqual(self._serializer.to_string(expectation), 'FOO : bar = BAZ //Qux.')
+        self.assertEqual(serializer.to_string(expectation), 'FOO : bar = BAZ //Qux.')
         expectation.expectations = ['bAz1', 'baZ2']
-        self.assertEqual(self._serializer.to_string(expectation), 'FOO : bar = BAZ1 BAZ2 //Qux.')
+        self.assertEqual(serializer.to_string(expectation), 'FOO : bar = BAZ1 BAZ2 //Qux.')
         expectation.modifiers = ['foo1', 'foO2']
-        self.assertEqual(self._serializer.to_string(expectation), 'FOO1 FOO2 : bar = BAZ1 BAZ2 //Qux.')
+        self.assertEqual(serializer.to_string(expectation), 'FOO1 FOO2 : bar = BAZ1 BAZ2 //Qux.')
         expectation.errors.append('Oh the horror.')
-        self.assertEqual(self._serializer.to_string(expectation), '')
+        self.assertEqual(serializer.to_string(expectation), '')
         expectation.original_string = 'Yes it is!'
-        self.assertEqual(self._serializer.to_string(expectation), 'Yes it is!')
+        self.assertEqual(serializer.to_string(expectation), 'Yes it is!')
+
+    def test_unparsed_list_to_string(self):
+        expectation = TestExpectationLine()
+        expectation.comment = 'Qux.'
+        expectation.name = 'bar'
+        expectation.modifiers = ['foo']
+        expectation.expectations = ['bAz1', 'baZ2']
+        self.assertEqual(TestExpectationSerializer.list_to_string([expectation]), 'FOO : bar = BAZ1 BAZ2 //Qux.')
 
     def test_parsed_to_string(self):