Title: [88780] trunk/Tools
Revision
88780
Author
hay...@chromium.org
Date
2011-06-13 23:31:18 -0700 (Mon, 13 Jun 2011)

Log Message

2011-06-13  Hayato Ito  <hay...@chromium.org>

        Reviewed by Ojan Vafai.

        [NRWT] Fix a WebKitDriver so that it returns an actual hash value if DRT returns that.
        https://bugs.webkit.org/show_bug.cgi?id=59188

        A current WebKitDriver doesn't try to return an actual hash value if DRT does not return an image.
        WebKitDriver should always return an actual hash value if DRT returns that.

        No tests since I'll add sample reftests to make sure mismatch reftests work later,
        which should be in a separate patch.

        * Scripts/webkitpy/layout_tests/port/webkit.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (88779 => 88780)


--- trunk/Tools/ChangeLog	2011-06-14 06:11:51 UTC (rev 88779)
+++ trunk/Tools/ChangeLog	2011-06-14 06:31:18 UTC (rev 88780)
@@ -1,3 +1,18 @@
+2011-06-13  Hayato Ito  <hay...@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [NRWT] Fix a WebKitDriver so that it returns an actual hash value if DRT returns that.
+        https://bugs.webkit.org/show_bug.cgi?id=59188
+
+        A current WebKitDriver doesn't try to return an actual hash value if DRT does not return an image.
+        WebKitDriver should always return an actual hash value if DRT returns that.
+
+        No tests since I'll add sample reftests to make sure mismatch reftests work later,
+        which should be in a separate patch.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-06-13  Kent Tamura  <tk...@chromium.org>
 
         [Chromium-win] Fix two wrong assertions exposed by r88757.

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (88779 => 88780)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2011-06-14 06:11:51 UTC (rev 88779)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2011-06-14 06:31:18 UTC (rev 88780)
@@ -441,6 +441,8 @@
             if block.content and block.content_type == 'image/png':
                 image = block.decoded_content
                 actual_image_hash = block.content_hash
+            elif block.content_hash:
+                actual_image_hash = block.content_hash
 
         error_lines = self._server_process.error.splitlines()
         # FIXME: This is a hack.  It is unclear why sometimes
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to