Changeset 55372 in webkit

Timestamp:

Mar 1, 2010 11:36:23 AM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-01 Dirk Pranke <​dpranke@chromium.org>

Reviewed by David Levin.

new-chromium-webkit-tests --platform=mac-leopard diffs are backwards
​https://bugs.webkit.org/show_bug.cgi?id=35265

Some parts of the code passed arguments as
"actual, expected" and some passed as "expected, actual".
As you might imagine, this lead to great confusion and wrongness.
Standardize on "expected, actual" as that's the order which is
passed to the underlying diff tool.

Based on a patch by Eric Siedel <​eric@webkit.org>.

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/test_types/image_diff.py

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-01  Dirk Pranke <dpranke@chromium.org>
+
+         Reviewed by David Levin.
+
+         new-chromium-webkit-tests --platform=mac-leopard diffs are backwards
+         https://bugs.webkit.org/show_bug.cgi?id=35265
+
+         Some parts of the code passed arguments as
+         "actual, expected" and some passed as "expected, actual".
+         As you might imagine, this lead to great confusion and wrongness.
+         Standardize on "expected, actual" as that's the order which is
+         passed to the underlying diff tool.
+
+         Based on a patch by Eric Siedel <eric@webkit.org>.
+
+         * Scripts/webkitpy/layout_tests/port/base.py:
+         * Scripts/webkitpy/layout_tests/port/chromium.py:
+         * Scripts/webkitpy/layout_tests/port/test.py:
+         * Scripts/webkitpy/layout_tests/test_types/image_diff.py
+
 2010-03-01  Chris Jerdonek  <cjerdonek@webkit.org>
 

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

@@ -76 +76 @@
         raise NotImplementedError('Port.check_sys_deps')
 
-    def compare_text(self, actual_text, expected_text):
+    def compare_text(self, expected_text, actual_text):
         """Return whether or not the two strings are *not* equal. This
         routine is used to diff text output.
@@ -82 +82 @@
         While this is a generic routine, we include it in the Port
         interface so that it can be overriden for testing purposes."""
-        return actual_text != expected_text
-
-    def diff_image(self, actual_filename, expected_filename,
+        return expected_text != actual_text
+
+    def diff_image(self, expected_filename, actual_filename,
                    diff_filename=None):
         """Compare two image files and produce a delta image file.
@@ -95 +95 @@
         interface so that it can be overriden for testing purposes."""
         executable = self._path_to_image_diff()
-        cmd = [executable, '--diff', actual_filename, expected_filename]
+        cmd = [executable, '--diff', expected_filename, actual_filename]
         if diff_filename:
             cmd.append(diff_filename)
@@ -112 +112 @@
         return result
 
-    def diff_text(self, actual_text, expected_text,
-                  actual_filename, expected_filename):
+    def diff_text(self, expected_text, actual_text,
+                  expected_filename, actual_filename):
         """Returns a string containing the diff of the two text strings
         in 'unified diff' format.
@@ -477 +477 @@
                '--start-insert=##WDIFF_ADD##',
                '--end-insert=##WDIFF_END##',
-               expected_filename,
-               actual_filename]
+               actual_filename,
+               expected_filename]
         global _wdiff_available
         result = ''

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

@@ -91 +91 @@
         return result
 
-    def compare_text(self, actual_text, expected_text):
-        return actual_text != expected_text
-
     def path_from_chromium_base(self, *comps):
         """Returns the full path to path made by joining the top of the

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

@@ -56 +56 @@
         return True
 
-    def diff_image(self, actual_filename, expected_filename,
+    def diff_image(self, expected_filename, actual_filename,
                    diff_filename=None):
         return False
 
-    def compare_text(self, actual_text, expected_text):
+    def compare_text(self, expected_text, actual_text):
         return False
 
-    def diff_text(self, actual_text, expected_text,
-                  actual_filename, expected_filename):
+    def diff_text(self, expected_text, actual_text,
+                  expected_filename, actual_filename):
         return ''
 
@@ -121 +121 @@
         return ''
 
-    def wdiff_text(self, actual_filename, expected_filename):
+    def wdiff_text(self, expected_filename, actual_filename):
         return ''
 

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

@@ -99 +99 @@
         try:
             _compare_available = True
-            result = port.diff_image(actual_filename, expected_filename,
+            result = port.diff_image(expected_filename, actual_filename,
                                      diff_filename)
         except ValueError: