Title: [100374] trunk/Tools
- Revision
- 100374
- Author
- [email protected]
- Date
- 2011-11-15 17:23:19 -0800 (Tue, 15 Nov 2011)
Log Message
Unreviewed, fix test-webkitpy tests. Move the check for image results
earlier.
* Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100373 => 100374)
--- trunk/Tools/ChangeLog 2011-11-16 01:06:13 UTC (rev 100373)
+++ trunk/Tools/ChangeLog 2011-11-16 01:23:19 UTC (rev 100374)
@@ -1,3 +1,11 @@
+2011-11-15 Tony Chang <[email protected]>
+
+ Unreviewed, fix test-webkitpy tests. Move the check for image results
+ earlier.
+
+ * Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+
2011-11-15 James Robinson <[email protected]>
[chromium] Fix flag name in chromium DumpRenderTree for accelerated video trigger
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py (100373 => 100374)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py 2011-11-16 01:06:13 UTC (rev 100373)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py 2011-11-16 01:23:19 UTC (rev 100374)
@@ -70,8 +70,9 @@
elif isinstance(failure, test_failures.FailureReftestMismatch):
writer.write_image_files(driver_output.image, expected_driver_output.image)
# FIXME: This work should be done earlier in the pipeline (e.g., when we compare images for non-ref tests).
- image_diff = port.diff_image(driver_output.image, expected_driver_output.image)[0]
- if image_diff:
+ # FIXME: We should always have 2 images here.
+ if driver_output.image and expected_driver_output.image:
+ image_diff = port.diff_image(driver_output.image, expected_driver_output.image)[0]
writer.write_image_diff_files(image_diff)
writer.copy_file(failure.reference_filename)
elif isinstance(failure, test_failures.FailureReftestMismatchDidNotOccur):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (100373 => 100374)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-16 01:06:13 UTC (rev 100373)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-16 01:23:19 UTC (rev 100374)
@@ -163,7 +163,7 @@
if not actual_contents or not expected_contents:
# FIXME: It's not clear what we should return in this case.
# Maybe we should throw an exception?
- return (None, 0)
+ return (True, 0)
process = self._start_image_diff_process(expected_contents, actual_contents)
return self._read_image_diff(process)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
