Attachment 155940 Details for Bug 92847 – Patch

[patch] Patch

bug-92847-20120801181259.patch (text/plain), 3.12 KB, created by Dirk Pranke on 2012-08-01 18:13:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Pranke

Created: 2012-08-01 18:13:17 PDT

Size: 3.12 KB

patch

obsolete

>Subversion Revision: 124378
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e9d66da31575b96308a0010c1cd46b2c953d302c..50efafaf6fefd6ac48f1f67f156a44fd8a63d4eb 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,5 +1,20 @@
> 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 NOBODY (OOPS!).
>+
>+        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>
>+
>         test-webkitpy: clean up handling of tests to skip
>         https://bugs.webkit.org/show_bug.cgi?id=92909
> 
>diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
>index 5909d7ce601c0fbe300155fa23dc98dca5faf9c7..89a34e92886b98cdcc70e81ba53d8ce311bd336e 100755
>--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py
>@@ -325,7 +325,8 @@ class Port(object):
>         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):
>diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
>index a366e89519d12bec738914815dd13d3827b4f37f..57b9822fa195acee426f006c1b48b3df14415f45 100755
>--- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
>@@ -254,13 +254,20 @@ class PortTestCase(unittest.TestCase):
>         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)

Actions: View | Formatted Diff | Diff

Attachments on bug 92847: 155940