Changeset 69153 in webkit

Timestamp:

Oct 5, 2010 3:33:18 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-10-05 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

[chromium] fix image diffing in NRWT
​https://bugs.webkit.org/show_bug.cgi?id=47128

• Scripts/webkitpy/layout_tests/port/chromium.py: Stop using

NamedTemporaryFile since it doesn't work on Windows.

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

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/test_types/image_diff.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-05  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] fix image diffing in NRWT
+        https://bugs.webkit.org/show_bug.cgi?id=47128
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py: Stop using
+            NamedTemporaryFile since it doesn't work on Windows.
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2010-10-05  Kenneth Russell  <kbr@google.com>
 

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

@@ -260 +260 @@
         if not os.path.exists(path):
             return None
-        with codecs.open(path, 'r', encoding) as file:
+        open_mode = 'r'
+        if encoding is None:
+            open_mode = 'r+b'
+        with codecs.open(path, open_mode, encoding) as file:
             return file.read()
 

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

@@ -135 +135 @@
                    diff_filename=None, tolerance=0):
         executable = self._path_to_image_diff()
-        expected_tmpfile = tempfile.NamedTemporaryFile()
-        expected_tmpfile.write(expected_contents)
-        actual_tmpfile = tempfile.NamedTemporaryFile()
-        actual_tmpfile.write(actual_contents)
+
+        tempdir = tempfile.mkdtemp()
+        expected_filename = os.path.join(tempdir, "expected.png")
+        with open(expected_filename, 'w+b') as file:
+            file.write(expected_contents)
+        actual_filename = os.path.join(tempdir, "actual.png")
+        with open(actual_filename, 'w+b') as file:
+            file.write(actual_contents)
+
         if diff_filename:
-            cmd = [executable, '--diff', expected_tmpfile.name,
-                   actual_tmpfile.name, diff_filename]
+            cmd = [executable, '--diff', expected_filename,
+                   actual_filename, diff_filename]
         else:
-            cmd = [executable, expected_tmpfile.name, actual_tmpfile.name]
+            cmd = [executable, expected_filename, actual_filename]
 
         result = True
         try:
-            if self._executive.run_command(cmd, return_exit_code=True) == 0:
-                return False
+            exit_code = self._executive.run_command(cmd, return_exit_code=True)
+            if exit_code == 0:
+                # The images are the same.
+                result = False
+            elif exit_code != 1:
+                # Some other error occurred.
+                raise ValueError("image diff returned an exit code of " +
+                                 str(exit_code))
         except OSError, e:
             if e.errno == errno.ENOENT or e.errno == errno.EACCES:
@@ -155 +166 @@
                 raise e
         finally:
-            expected_tmpfile.close()
-            actual_tmpfile.close()
+            shutil.rmtree(tempdir)
         return result
 

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

@@ -157 +157 @@
         self.assertTrue(port.default_configuration_called)
 
+    def test_diff_image(self):
+        class TestPort(ChromiumPortTest.TestLinuxPort):
+            def _path_to_image_diff(self):
+                return "/path/to/image_diff"
+
+        class EmptyOptions:
+            use_drt = False
+
+        class MockExecute:
+            def __init__(self, result):
+                self._result = result
+
+            def run_command(self,
+                            args,
+                            cwd=None,
+                            input=None,
+                            error_handler=None,
+                            return_exit_code=False,
+                            return_stderr=True,
+                            decode_output=False):
+                return self._result
+
+        options = EmptyOptions()
+        port = ChromiumPortTest.TestLinuxPort(options)
+
+        # Images are different.
+        port._executive = MockExecute(0)
+        self.assertEquals(False, port.diff_image("EXPECTED", "ACTUAL"))
+
+        # Images are the same.
+        port._executive = MockExecute(1)
+        self.assertEquals(True, port.diff_image("EXPECTED", "ACTUAL"))
+
+        # There was some error running image_diff.
+        port._executive = MockExecute(2)
+        exception_raised = False
+        try:
+            port.diff_image("EXPECTED", "ACTUAL")
+        except ValueError, e:
+            exception_raised = True
+        self.assertTrue(exception_raised)
+
 if __name__ == '__main__':
     unittest.main()

trunk/WebKitTools/Scripts/webkitpy/layout_tests/test_types/image_diff.py

@@ -105 +105 @@
 
         expected_image = port.expected_image(filename)
-        with codecs.open(actual_filename, 'r', None) as file:
+        with codecs.open(actual_filename, 'r+b', None) as file:
             actual_image = file.read()