Changeset 69075 in webkit

Timestamp:

Oct 4, 2010 10:26:30 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-10-04 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r69066.
​http://trac.webkit.org/changeset/69066
​https://bugs.webkit.org/show_bug.cgi?id=47163

Made NRWT reliability worse. (Requested by tkent on #webkit).

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r69066.
+        http://trac.webkit.org/changeset/69066
+        https://bugs.webkit.org/show_bug.cgi?id=47163
+
+        Made NRWT reliability worse. (Requested by tkent on #webkit).
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2010-10-04  Gabor Rapcsanyi  <rgabor@inf.u-szeged.hu>
 

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

@@ -137 +137 @@
         expected_tmpfile = tempfile.NamedTemporaryFile()
         expected_tmpfile.write(expected_contents)
-        expected_tmpfile.flush()
         actual_tmpfile = tempfile.NamedTemporaryFile()
         actual_tmpfile.write(actual_contents)
-        actual_tmpfile.flush()
         if diff_filename:
             cmd = [executable, '--diff', expected_tmpfile.name,
@@ -149 +147 @@
         result = True
         try:
-            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))
+            if self._executive.run_command(cmd, return_exit_code=True) == 0:
+                return False
         except OSError, e:
             if e.errno == errno.ENOENT or e.errno == errno.EACCES:

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()