Title: [172370] trunk/Tools
- Revision
- 172370
- Author
- [email protected]
- Date
- 2014-08-08 18:14:52 -0700 (Fri, 08 Aug 2014)
Log Message
Unbreak webkitpy unit tests by checking for the existence of the image diff template
file before trying to open it (as the tests do for results.html).
* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
(TestResultWriter.write_image_diff_files):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172369 => 172370)
--- trunk/Tools/ChangeLog 2014-08-09 01:12:28 UTC (rev 172369)
+++ trunk/Tools/ChangeLog 2014-08-09 01:14:52 UTC (rev 172370)
@@ -1,5 +1,13 @@
2014-08-08 Simon Fraser <[email protected]>
+ Unbreak webkitpy unit tests by checking for the existence of the image diff template
+ file before trying to open it (as the tests do for results.html).
+
+ * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+ (TestResultWriter.write_image_diff_files):
+
+2014-08-08 Simon Fraser <[email protected]>
+
Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy
https://bugs.webkit.org/show_bug.cgi?id=135780
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (172369 => 172370)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2014-08-09 01:12:28 UTC (rev 172369)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2014-08-09 01:14:52 UTC (rev 172370)
@@ -169,7 +169,11 @@
self._write_binary_file(diff_filename, image_diff)
base_dir = self._port.path_from_webkit_base('LayoutTests', 'fast', 'harness')
- image_diff_file = self._filesystem.read_text_file(self._filesystem.join(base_dir, 'image-diff-template.html'))
+
+ image_diff_template = self._filesystem.join(base_dir, 'image-diff-template.html');
+ image_diff_file = ""
+ if self._filesystem.exists(image_diff_template):
+ image_diff_file = self._filesystem.read_text_file(image_diff_template)
# FIXME: old-run-webkit-tests shows the diff percentage as the text contents of the "diff" link.
# FIXME: old-run-webkit-tests include a link to the test file.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
