Modified: trunk/Tools/ChangeLog (124400 => 124401)
--- trunk/Tools/ChangeLog 2012-08-02 02:29:39 UTC (rev 124400)
+++ trunk/Tools/ChangeLog 2012-08-02 02:31:18 UTC (rev 124401)
@@ -1,5 +1,20 @@
2012-08-01 Dirk Pranke <[email protected]>
+ 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 <[email protected]>
+
test-webkitpy: clean up handling of tests to skip
https://bugs.webkit.org/show_bug.cgi?id=92909
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (124400 => 124401)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-02 02:29:39 UTC (rev 124400)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-02 02:31:18 UTC (rev 124401)
@@ -325,7 +325,8 @@
if not self._image_differ:
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)
def diff_text(self, expected_text, actual_text, expected_filename, actual_filename):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py (124400 => 124401)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-08-02 02:29:39 UTC (rev 124400)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-08-02 02:31:18 UTC (rev 124401)
@@ -254,13 +254,20 @@
self.proc = None
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
port._server_process_constructor = make_proc
port.setup_test_run()
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)
self.assertEquals(port._image_differ, None)
