Changeset 124401 in webkit

Timestamp:

Aug 1, 2012 7:31:18 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

REGRESSION(r123893): Reftest mismatches are run through ImageDiff with 0.1 tolerance
​https://bugs.webkit.org/show_bug.cgi?id=92847

Reviewed by Ojan Vafai.

I was failing to distinguish between 'None' and 0 :(. Fixed and added tests.

• Scripts/webkitpy/layout_tests/port/base.py:

(Port.diff_image):

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

(PortTestCase.test_diff_image.make_proc):
(PortTestCase.test_diff_image):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-01  Dirk Pranke  <dpranke@chromium.org>
+
+        REGRESSION(r123893): Reftest mismatches are run through ImageDiff with 0.1 tolerance
+        https://bugs.webkit.org/show_bug.cgi?id=92847
+
+        Reviewed by Ojan Vafai.
+
+        I was failing to distinguish between 'None' and 0 :(. Fixed and added tests.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port.diff_image):
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        (PortTestCase.test_diff_image.make_proc):
+        (PortTestCase.test_diff_image):
+
 2012-08-01  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -326 +326 @@
             self._image_differ = image_diff.ImageDiffer(self)
         self.set_option_default('tolerance', 0.1)
-        tolerance = tolerance or self.get_option('tolerance')
+        if tolerance is None:
+            tolerance = self.get_option('tolerance')
         return self._image_differ.diff_image(expected_contents, actual_contents, tolerance)
 

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

@@ -255 +255 @@
 
         def make_proc(port, nm, cmd, env):
-            self.proc = MockServerProcess(port, nm, cmd, env, lines=['diff: 100% failed\n'])
+            self.proc = MockServerProcess(port, nm, cmd, env, lines=['diff: 100% failed\n', 'diff: 100% failed\n'])
             return self.proc
 
@@ -262 +262 @@
         self.assertEquals(port.diff_image('foo', 'bar'), ('', 100.0))
         self.assertEquals(self.proc.cmd[1:3], ["--tolerance", "0.1"])
+
+        self.assertEquals(port.diff_image('foo', 'bar', None), ('', 100.0))
+        self.assertEquals(self.proc.cmd[1:3], ["--tolerance", "0.1"])
+
+        self.assertEquals(port.diff_image('foo', 'bar', 0), ('', 100.0))
+        self.assertEquals(self.proc.cmd[1:3], ["--tolerance", "0"])
+
         port.clean_up_test_run()
         self.assertTrue(self.proc.stopped)