Commit 65914926 authored by Quinten Yearsley's avatar Quinten Yearsley Committed by Commit Bot

Switch the default layout test results viewer page

This CL:
 - renames "test-expectations.html" so that it is called "results.html"
 - renames the old results.html to be "legacy-results.html"

blink-dev thread:
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/9NFDSTEzcd4

Bug: 748628
Change-Id: Id8293ed24f680b71cf1bdb3e134cdb130154ee14
Reviewed-on: https://chromium-review.googlesource.com/775973
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: default avatarAleks Totic <atotic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517462}
parent 010dce34
......@@ -21,7 +21,7 @@
# not SKIP, just WONTFIX.
fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
# Not intended to be run as a test.
fast/harness/test-expectations.html [ WontFix ]
fast/harness/results.html [ WontFix ]
# Platform specific virtual test suites.
[ Win Mac Android ] virtual/linux-subpixel [ WontFix ]
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -185,17 +185,16 @@ class Manager(object):
self._upload_json_files()
results_path = self._filesystem.join(self._results_directory, 'results.html')
self._copy_results_html_file(results_path)
expectations_path = self._filesystem.join(self._results_directory, 'test-expectations.html')
self._copy_testexpectations_html_file(expectations_path)
self._copy_results_html_file(self._results_directory, 'results.html')
self._copy_results_html_file(self._results_directory, 'legacy-results.html')
if initial_results.keyboard_interrupted:
exit_code = exit_codes.INTERRUPTED_EXIT_STATUS
else:
if initial_results.interrupted:
exit_code = exit_codes.EARLY_EXIT_STATUS
if self._options.show_results and (exit_code or initial_results.total_failures):
self._port.show_results_html_file(results_path)
self._port.show_results_html_file(
self._filesystem.join(self._results_directory, 'results.html'))
self._printer.print_results(time.time() - start_time, initial_results)
return test_run_results.RunDetails(
......@@ -572,19 +571,16 @@ class Manager(object):
except IOError as err:
_log.error('Upload failed: %s', err)
def _copy_results_html_file(self, destination_path):
base_dir = self._path_finder.path_from_layout_tests('fast', 'harness')
results_file = self._filesystem.join(base_dir, 'results.html')
# Note that the results.html template file won't exist when we're using a MockFileSystem during unit tests,
# so make sure it exists before we try to copy it.
if self._filesystem.exists(results_file):
self._filesystem.copyfile(results_file, destination_path)
def _copy_testexpectations_html_file(self, destination_path):
base_dir = self._path_finder.path_from_layout_tests('fast', 'harness')
expectations_file = self._filesystem.join(base_dir, 'test-expectations.html')
if self._filesystem.exists(expectations_file):
self._filesystem.copyfile(expectations_file, destination_path)
def _copy_results_html_file(self, destination_dir, filename):
"""Copies a file from the template directory to the results directory."""
template_dir = self._path_finder.path_from_layout_tests('fast', 'harness')
source_path = self._filesystem.join(template_dir, filename)
destination_path = self._filesystem.join(destination_dir, filename)
# Note that the results.html template file won't exist when
# we're using a MockFileSystem during unit tests, so make sure
# it exists before we try to copy it.
if self._filesystem.exists(source_path):
self._filesystem.copyfile(source_path, destination_path)
def _stats_trie(self, initial_results):
def _worker_number(worker_name):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment