Remove special summary case, more full output everywhere

Author: cmaloney

Lib/test/libregrtest/main.py

@@ -285,7 +285,6 @@ def _rerun_failed_tests(self, runtests: RunTests) -> RunTests:
             fail_fast=False,
             match_tests_dict=match_tests_dict,
             output_on_failure=False,
-            # Annotate tests which fail again
             github_annotations=bool(os.environ.get("GITHUB_STEP_SUMMARY")))
         self.logger.set_tests(runtests)
 
@@ -495,11 +494,6 @@ def write_github_summary(self) -> None:
             return
         # Tests which failed in the last run (the re-run, if any)
         failed = self.results.rerun_results
-        if not self.results.rerun:
-            # Failed tests were not re-run (ex: --python): annotate them now.
-            # Otherwise, they were annotated when they failed again.
-            for result in failed:
-                result.print_github_annotations()
         cases = [(result.errors or []) + (result.failures or [])
                  for result in failed]
         ncase = sum(map(len, cases))
@@ -561,7 +555,10 @@ def create_run_tests(self, tests: TestTuple) -> RunTests:
             hunt_refleak=self.hunt_refleak,
             test_dir=self.test_dir,
             use_junit=(self.junit_filename is not None),
-            github_annotations=False,
+            # Only annotate failures of the last run: the re-run, if any
+            github_annotations=(bool(os.environ.get("GITHUB_STEP_SUMMARY"))
+                                and not (self.want_rerun
+                                         and not self.python_cmd)),
             coverage=self.coverage,
             memory_limit=self.memory_limit,
             gc_threshold=self.gc_threshold,

Lib/test/libregrtest/result.py

@@ -1,6 +1,5 @@
 import dataclasses
 import json
-import os
 from _colorize import get_colors  # type: ignore[import-not-found]
 from typing import Any
 
@@ -179,34 +178,17 @@ def __str__(self) -> str:
     def has_meaningful_duration(self):
         return State.has_meaningful_duration(self.state)
 
-    def get_github_annotations(self) -> list[tuple[str, str]]:
-        """(test case name, message) of each failed test case.
-
-        Without test case details (crash, timeout, env changed, etc.), return
-        the test name and the test result.
-        """
-        if not os.environ.get("GITHUB_STEP_SUMMARY"):
-            return []
-        annotations = (self.errors or []) + (self.failures or [])
-        if not annotations:
-            message = "\n".join([str(self), *(self.env_changed_reasons or ())])
-            annotations = [(self.test_name, message)]
-        return annotations
-
-    def print_github_annotations(self) -> None:
-        """Print a GitHub Actions error annotation per failed test case."""
-        for title, message in self.get_github_annotations():
-            print(github_annotation(title, message), flush=True)
-
     def print_github_crash_annotation(self, fail_env_changed: bool) -> None:
         """Annotate a failed test without test case failures.
 
-        Test case failures are annotated by the test runner, where they are
-        reported (see RegressionTestResult.printErrorList()).
+        For example: crash, timeout, env changed. Test case failures are
+        annotated by the test runner, where they are reported (see
+        RegressionTestResult.printErrorList()).
         """
         if (self.is_failed(fail_env_changed)
                 and not self.errors and not self.failures):
-            self.print_github_annotations()
+            message = "\n".join([str(self), *(self.env_changed_reasons or ())])
+            print(github_annotation(self.test_name, message), flush=True)
 
     def set_env_changed(self, *reasons):
         if self.state is None or self.state == State.PASSED:

Lib/test/libregrtest/testresult.py

@@ -154,11 +154,16 @@ def get_xml_element(self):
 
 class QuietRegressionTestRunner:
     def __init__(self, stream, buffer=False):
+        # Wrap the stream as TextTestRunner does, for printErrors()
+        stream = unittest.runner._WritelnDecorator(stream)
         self.result = RegressionTestResult(stream, None, 0)
         self.result.buffer = buffer
 
     def run(self, test):
         test(self.result)
+        if self.result.GITHUB_ANNOTATIONS:
+            # Report annotated failures, as in verbose mode
+            self.result.printErrors()
         return self.result
 
 def get_test_runner_class(verbosity, buffer=False):