Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 15:18:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8513 - mrobinson:wpt-ui-summary, r=frewsxcv

Browse source 
Re-print test failures in non-interactive WPT UI

This will make it easier to spot the failures at the bottom of the test
output on the bots.

Fixes #8467.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8513)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-15 21:36:29 +05:30
commit d11fe9ed21
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/wpt/grouping_formatter.py
View file

@ -20,6 +20,7 @@ class GroupingFormatter(base.BaseFormatter):
self.last_test_finished = "Running tests..." self.last_test_finished = "Running tests..."
self.test_output = collections.defaultdict(str) self.test_output = collections.defaultdict(str)
self.subtest_failures = collections.defaultdict(list) self.subtest_failures = collections.defaultdict(list)
self.test_failure_text = ""
self.tests_with_failing_subtests = [] self.tests_with_failing_subtests = []
self.interactive = os.isatty(sys.stdout.fileno()) self.interactive = os.isatty(sys.stdout.fileno())
@ -182,7 +183,7 @@ class GroupingFormatter(base.BaseFormatter):
if self.interactive: if self.interactive:
return self.generate_output(text=None, new_display=new_display) return self.generate_output(text=None, new_display=new_display)
else: else:
return self.generate_output(text=" %s\n\n" % test_name, return self.generate_output(text=" %s\n" % test_name,
new_display=new_display) new_display=new_display)
# If the test crashed or timed out, we also include any process output, # If the test crashed or timed out, we also include any process output,
@ -208,6 +209,7 @@ class GroupingFormatter(base.BaseFormatter):
self.tests_with_failing_subtests.append(test_name) self.tests_with_failing_subtests.append(test_name)
output += self.get_output_for_unexpected_subtests(test_name, output += self.get_output_for_unexpected_subtests(test_name,
subtest_failures) subtest_failures)
self.test_failure_text += output
return self.generate_output(text=output, new_display=new_display) return self.generate_output(text=output, new_display=new_display)
@ -218,7 +220,12 @@ class GroupingFormatter(base.BaseFormatter):
def suite_end(self, data): def suite_end(self, data):
self.end_time = data["time"] self.end_time = data["time"]
output = u"Ran %i tests finished in %.1f seconds.\n" % ( if not self.interactive:
output = u"\n"
else:
output = ""
output += u"Ran %i tests finished in %.1f seconds.\n" % (
self.completed_tests, (self.end_time - self.start_time) / 1000) self.completed_tests, (self.end_time - self.start_time) / 1000)
output += u" \u2022 %i ran as expected. %i tests skipped.\n" % ( output += u" \u2022 %i ran as expected. %i tests skipped.\n" % (
sum(self.expected.values()), self.expected['SKIP']) sum(self.expected.values()), self.expected['SKIP'])
@ -240,8 +247,13 @@ class GroupingFormatter(base.BaseFormatter):
if num_with_failing_subtests: if num_with_failing_subtests:
output += (u" \u2022 %i tests had unexpected subtest results\n" output += (u" \u2022 %i tests had unexpected subtest results\n"
% num_with_failing_subtests) % num_with_failing_subtests)
output += "\n" output += "\n"
# Repeat failing test output, so that it is easier to find, since the
# non-interactive version prints all the test names.
if not self.interactive and self.test_failure_text:
output += u"Tests with unexpected results:\n" + self.test_failure_text
return self.generate_output(text=output, new_display="") return self.generate_output(text=output, new_display="")
def process_output(self, data): def process_output(self, data):