Improve results output

mrobinson · mrobinson · commit ebc748975535 · 2023-04-25T14:49:32.000+02:00
diff --git a/etc/ci/report_aggregated_expected_results.py b/etc/ci/report_aggregated_expected_results.py
@@ -34,14 +34,14 @@ def __init__(self, title: str, body: str, children: list[Item]):
         self.children = children
 
     @classmethod
-    def from_result(cls, result: dict, title_key: str = "path", title_prefix: str = "", print_stack=True):
+    def from_result(cls, result: dict, title: Optional[str] = None, print_stack=True):
         expected = result["expected"]
         actual = result["actual"]
-        title = result[title_key]
+        title = title if title else result["path"]
         if expected != actual:
-            title = f"{actual} [expected {expected}] {title_prefix}{title}"
+            title = f"{actual} [expected {expected}] {title}"
         else:
-            title = f"{actual} {title_prefix}{title}"
+            title = f"{actual} {title}"
 
         issue_url = "http://github.com/servo/servo/issues/"
         if "issues" in result and result["issues"]:
@@ -54,7 +54,10 @@ def from_result(cls, result: dict, title_key: str = "path", title_prefix: str =
 
         subtest_results = result.get("unexpected_subtest_results", [])
         children = [
-            cls.from_result(subtest_result, "subtest", "subtest: ", False)
+            cls.from_result(
+                subtest_result,
+                f"subtest: {subtest_result['subtest']} {subtest_result.get('message', '')}",
+                False)
             for subtest_result in subtest_results
         ]
         return cls(title, body, children)
diff --git a/python/wpt/grouping_formatter.py b/python/wpt/grouping_formatter.py
@@ -93,7 +93,11 @@ def to_lines(result: Any[UnexpectedSubtestResult, UnexpectedResult], print_stack
 
         # Test names sometimes contain control characters, which we want
         # to be printed in their raw form, and not their interpreted form.
-        first_line += f" {result.path.encode('unicode-escape').decode('utf-8')}"
+        if isinstance(result, UnexpectedSubtestResult):
+            title = result.subtest
+        else:
+            title = result.path
+        first_line += f" {title.encode('unicode-escape').decode('utf-8')}"
 
         if isinstance(result, UnexpectedResult) and result.issues:
             first_line += f" ({', '.join([f'#{bug}' for bug in result.issues])})"
