Title: [100356] trunk/Tools
- Revision
- 100356
- Author
- [email protected]
- Date
- 2011-11-15 16:04:20 -0800 (Tue, 15 Nov 2011)
Log Message
Unreviewed, better fix for ref tests failures on SL Intel bot.
Revert the previous change and return None if pixel results from
either the test page or the expected page is missing.
* Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100355 => 100356)
--- trunk/Tools/ChangeLog 2011-11-16 00:02:33 UTC (rev 100355)
+++ trunk/Tools/ChangeLog 2011-11-16 00:04:20 UTC (rev 100356)
@@ -1,3 +1,12 @@
+2011-11-15 Tony Chang <[email protected]>
+
+ Unreviewed, better fix for ref tests failures on SL Intel bot.
+ Revert the previous change and return None if pixel results from
+ either the test page or the expected page is missing.
+
+ * 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] Merge chromium-gpu layout test configurations into non-gpu versions
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py (100355 => 100356)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py 2011-11-16 00:02:33 UTC (rev 100355)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py 2011-11-16 00:04:20 UTC (rev 100356)
@@ -58,9 +58,7 @@
writer.write_image_files(driver_output.image, expected_driver_output.image)
elif isinstance(failure, test_failures.FailureImageHashMismatch):
writer.write_image_files(driver_output.image, expected_driver_output.image)
- # FIXME: Why is image_diff a bool on SL bot? Maybe ImageDiff isn't found?
- if driver_output.image_diff:
- writer.write_image_diff_files(str(driver_output.image_diff))
+ writer.write_image_diff_files(driver_output.image_diff)
elif isinstance(failure, (test_failures.FailureAudioMismatch,
test_failures.FailureMissingAudio)):
writer.write_audio_files(driver_output.audio, expected_driver_output.audio)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (100355 => 100356)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-16 00:02:33 UTC (rev 100355)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-16 00:04:20 UTC (rev 100356)
@@ -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 (True, 0)
+ return (None, 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
