+2011-01-19 Dirk Pranke <dpranke@chromium.org>
+
+ Unreviewed, build fix.
+
+ Fix a couple of minor bugs discovered while bringing up new bots
+ for testing.
+
+ * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2011-01-19 James Robinson <jamesr@chromium.org>
Unreviewed, rolling out r76194.
# This is created in run_webkit_tests.py:_PrepareListsAndPrintOutput.
tests_run_filename = self._port._filesystem.join(self._options.results_directory,
"tests_run.txt")
- tests_run_file = self._port._filesystem.open_text_file_for_writing(tests_run_filename, append=True)
-
+ tests_run_file = self._port._filesystem.open_text_file_for_writing(tests_run_filename, append=False)
while True:
if self._canceled:
_log.debug('Testing cancelled')
printer.cleanup()
return 0
- last_unexpected_results = _gather_unexpected_results(options)
+ last_unexpected_results = _gather_unexpected_results(port, options)
if options.print_last_failures:
printer.write("\n".join(last_unexpected_results) + "\n")
printer.cleanup()
return warnings
-def _gather_unexpected_results(options):
+def _gather_unexpected_results(port, options):
"""Returns the unexpected results from the previous run, if any."""
last_unexpected_results = []
if options.print_last_failures or options.retest_last_failures:
unexpected_results_filename = os.path.join(
options.results_directory, "unexpected_results.json")
- with codecs.open(unexpected_results_filename, "r", "utf-8") as file:
+ if port._filesystem.exists(unexpected_results_filename):
+ file = port._filesystem.read_text_file(unexpected_results.json)
results = simplejson.load(file)
- last_unexpected_results = results['tests'].keys()
+ last_unexpected_results = results['tests'].keys()
return last_unexpected_results