[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 23975c5bf51d6a691614a4da6d99de32e895b2b5
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 23:39:35 2010 +0000

    2010-10-05  Tony Chang  <tony at chromium.org>
    
            Reviewed by Ojan Vafai (over the shoulder).
    
            Paper over errors in image_diff so we don't crash the whole test run.
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d6d5a1f..30f239d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-05  Tony Chang  <tony at chromium.org>
 
+        Reviewed by Ojan Vafai (over the shoulder).
+
+        Paper over errors in image_diff so we don't crash the whole test run.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
+2010-10-05  Tony Chang  <tony at chromium.org>
+
         Unreviewed, make shutil.rmtree more resiliant to errors
         since windows was raising WindowsError: The process cannot access the file because it
         is being used by another process.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 1802471..301d4b1 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -156,9 +156,14 @@ class ChromiumPort(base.Port):
                 # 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))
+                _log.error("image diff returned an exit code of "
+                           + str(exit_code))
+                # Returning False here causes the script to think that we
+                # successfully created the diff even though we didn't.  If
+                # we return True, we think that the images match but the hashes
+                # don't match.
+                # FIXME: Figure out why image_diff returns other values.
+                result = False
         except OSError, e:
             if e.errno == errno.ENOENT or e.errno == errno.EACCES:
                 _compare_available = False

-- 
WebKit Debian packaging