Changeset 70279 in webkit

Timestamp:

Oct 21, 2010 5:52:10 PM (14 years ago)

Author:

mihaip@chromium.org

Message:

2010-10-21 Mihai Parparita <​mihaip@chromium.org>

Unreviewed fix for rebaseline-chromium-webkit-tests.

Port.diff_image no longer has a tolerance parameter. Also, use
get_option('tolerance') which is safer if the options object doesn't
define a tolerance attribute (it doesn't for the one used in
rebaseline_chromium_webkit_tests).

• Scripts/webkitpy/layout_tests/port/port_testcase.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-21  Mihai Parparita  <mihaip@chromium.org>
+
+        Unreviewed fix for rebaseline-chromium-webkit-tests.
+
+        Port.diff_image no longer has a tolerance parameter. Also, use
+        get_option('tolerance') which is safer if the options object doesn't
+        define a tolerance attribute (it doesn't for the one used in
+        rebaseline_chromium_webkit_tests).
+
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
 2010-10-21  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -36 +36 @@
 mock_options = mocktool.MockOptions(results_directory='layout-test-results',
                                     use_apache=True,
-                                    configuration='Release',
-                                    tolerance=None)
+                                    configuration='Release')
 
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -138 +138 @@
         # self.set_option_default('tolerance', 0.1) once that behaves correctly
         # with default values.
-        if self._options.tolerance is not None:
-            tolerance = self._options.tolerance
+        if self.get_option('tolerance') is not None:
+            tolerance = self.get_option('tolerance')
         else:
             tolerance = 0.1

trunk/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

@@ -497 +497 @@
 
         if is_image:
-            return self._port.diff_image(output1, output2, None, 0)
+            return self._port.diff_image(output1, output2, None)
         else:
             return self._port.compare_text(output1, output2)