Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add a test counter in WPT’s non-interactive output

Browse source
This commit is contained in:
Simon Sapin 2019-12-01 21:16:27 +01:00
parent 8dc703f1df
commit f0b970d90d
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/wpt/grouping_formatter.py
View file

@ -89,11 +89,14 @@ class ServoFormatter(base.BaseFormatter):
self.current_display = new_display self.current_display = new_display
return output + self.current_display return output + self.current_display
def build_status_line(self): def test_counter(self):
if self.number_of_tests == 0: if self.number_of_tests == 0:
new_display = " [%i] " % self.completed_tests return " [%i] " % self.completed_tests
else: else:
new_display = " [%i/%i] " % (self.completed_tests, self.number_of_tests) return " [%i/%i] " % (self.completed_tests, self.number_of_tests)
def build_status_line(self):
new_display = self.test_counter()
if self.running_tests: if self.running_tests:
indent = " " * len(new_display) indent = " " * len(new_display)
@ -117,8 +120,8 @@ class ServoFormatter(base.BaseFormatter):
def test_start(self, data): def test_start(self, data):
self.running_tests[data['thread']] = data['test'] self.running_tests[data['thread']] = data['test']
return self.generate_output(text=None, if self.interactive:
new_display=self.build_status_line()) return self.generate_output(new_display=self.build_status_line())
def wrap_and_indent_lines(self, lines, indent): def wrap_and_indent_lines(self, lines, indent):
assert(len(lines) > 0) assert(len(lines) > 0)
@ -197,15 +200,14 @@ class ServoFormatter(base.BaseFormatter):
subtest_failures = self.subtest_failures.pop(test_name, []) subtest_failures = self.subtest_failures.pop(test_name, [])
del self.running_tests[data['thread']] del self.running_tests[data['thread']]
new_display = self.build_status_line()
if not had_unexpected_test_result and not subtest_failures: if not had_unexpected_test_result and not subtest_failures:
self.expected[test_status] += 1 self.expected[test_status] += 1
if self.interactive: if self.interactive:
return self.generate_output(text=None, new_display=new_display) new_display = self.build_status_line()
return self.generate_output(new_display=new_display)
else: else:
return self.generate_output(text=" %s\n" % test_name, return self.generate_output(text="%s%s\n" % (self.test_counter(), test_name))
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,
# because there is a good chance that the test produced a stack trace # because there is a good chance that the test produced a stack trace
@ -232,6 +234,7 @@ class ServoFormatter(base.BaseFormatter):
subtest_failures) subtest_failures)
self.test_failure_text += output self.test_failure_text += output
new_display = self.build_status_line()
return self.generate_output(text=output, new_display=new_display, return self.generate_output(text=output, new_display=new_display,
unexpected_in_test=test_name) unexpected_in_test=test_name)