Changeset 83806 in webkit

Timestamp:

Apr 13, 2011 7:14:08 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-13 Dirk Pranke <​dpranke@chromium.org>

Unreviewed, build fix.
​https://bugs.webkit.org/show_bug.cgi?id=52763

r83799 broke test-webkitpy because it assumed we always have
access to a real filesystem (we don't during the unit tests).
Stubbing out the copy for now but we might need a better
solution at some point.

• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+        https://bugs.webkit.org/show_bug.cgi?id=52763
+
+        r83799 broke test-webkitpy because it assumed we always have
+        access to a real filesystem (we don't during the unit tests).
+        Stubbing out the copy for now but we might need a better
+        solution at some point.
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+
 2011-04-13  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -1195 +1195 @@
     def _write_unexpected_results_html_file(self, unexpected_results):
         base_dir = self._port.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'layout_tests', 'layout_package')
-        self._fs.copyfile(self._fs.join(base_dir, "json_results.html"), self._fs.join(self._results_directory, "json_results.html"))
+        results_file = self._fs.join(base_dir, 'json_results.html')
+        # FIXME: What should we do if this doesn't exist (e.g., in unit tests)?
+        if self._fs.exists(results_file):
+            self._fs.copyfile(results_file, self._fs.join(self._results_directory, "json_results.html"))
 
     def _show_results_html_file(self):