Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Print reason when tests are skipped. (#33077)

Browse source 
* Print reason when tests are skipped.

Signed-off-by: Josh Matthews <josh@joshmatthews.net>

* Print reason tests are skipped in Servo's WPT formatter

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

---------

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Josh Matthews 2024-08-23 04:39:39 -04:00 • committed by GitHub
parent e956b53827
commit 0afcb83e9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
python/wpt/grouping_formatter.py
View file

@ -230,6 +230,7 @@ class ServoFormatter(mozlog.formatters.base.BaseFormatter, ServoHandler):
ServoHandler.__init__(self) ServoHandler.__init__(self)
self.current_display = "" self.current_display = ""
self.interactive = os.isatty(sys.stdout.fileno()) self.interactive = os.isatty(sys.stdout.fileno())
self.number_skipped = 0
if self.interactive: if self.interactive:
self.line_width = os.get_terminal_size().columns self.line_width = os.get_terminal_size().columns
@ -296,17 +297,24 @@ class ServoFormatter(mozlog.formatters.base.BaseFormatter, ServoHandler):
def test_end(self, data): def test_end(self, data):
unexpected_result = ServoHandler.test_end(self, data) unexpected_result = ServoHandler.test_end(self, data)
if not unexpected_result: if unexpected_result:
if self.interactive:
return self.generate_output(new_display=self.build_status_line())
else:
return self.generate_output(text="%s%s\n" % (self.test_counter(), data["test"]))
# Surround test output by newlines so that it is easier to read. # Surround test output by newlines so that it is easier to read.
output_for_unexpected_test = f"{unexpected_result}\n" output_for_unexpected_test = f"{unexpected_result}\n"
return self.generate_output(text=output_for_unexpected_test, return self.generate_output(text=output_for_unexpected_test,
new_display=self.build_status_line()) new_display=self.build_status_line())
# Print reason that tests are skipped.
if data["status"] == "SKIP":
self.number_skipped += 1
lines = [f"SKIP {data['test']}", f"{data['message']}\n"]
output_for_skipped_test = UnexpectedResult.wrap_and_indent_lines(lines, indent=" ")
return self.generate_output(text=output_for_skipped_test, new_display=self.build_status_line())
if self.interactive:
return self.generate_output(new_display=self.build_status_line())
else:
return self.generate_output(text="%s%s\n" % (self.test_counter(), data["test"]))
def test_status(self, data): def test_status(self, data):
ServoHandler.test_status(self, data) ServoHandler.test_status(self, data)
@ -319,8 +327,9 @@ class ServoFormatter(mozlog.formatters.base.BaseFormatter, ServoHandler):
output += u"Ran %i tests finished in %.1f seconds.\n" % ( output += u"Ran %i tests finished in %.1f seconds.\n" % (
self.completed_tests, (data["time"] - self.suite_start_time) / 1000) self.completed_tests, (data["time"] - self.suite_start_time) / 1000)
output += u" \u2022 %i ran as expected. %i tests skipped.\n" % ( output += f" \u2022 {len(self.expected.values())} ran as expected.\n"
sum(self.expected.values()), self.expected['SKIP']) if self.number_skipped:
output += f" \u2022 {self.number_skipped} skipped.\n"
def text_for_unexpected_list(text, section): def text_for_unexpected_list(text, section):
tests = self.unexpected_tests[section] tests = self.unexpected_tests[section]