Adjust and simplify a little

Author: cmaloney

Lib/test/libregrtest/main.py

@@ -16,7 +16,7 @@
 from .logger import Logger
 from .pgo import setup_pgo_tests
 from .result import TestResult
-from .results import TestResults, EXITCODE_INTERRUPTED, annotate_github
+from .results import TestResults, EXITCODE_INTERRUPTED
 from .runtests import RunTests, HuntRefleak
 from .setup import setup_process, setup_test_dir
 from .single import run_single_test, PROGRESS_MIN_TIME
@@ -27,7 +27,7 @@
     printlist, get_temp_dir, get_work_dir, exit_timeout,
     display_header, cleanup_temp_dir, print_warning,
     is_cross_compiled, get_host_runner, display_title,
-    get_process_memory_usage, EXIT_TIMEOUT)
+    get_process_memory_usage, github_annotation, EXIT_TIMEOUT)
 
 
 class Regrtest:
@@ -491,10 +491,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
-            for result in failed:
-                annotate_github(result)
         cases = [(result.errors or []) + (result.failures or [])
                  for result in failed]
         ncase = sum(map(len, cases))
@@ -511,7 +507,14 @@ def write(text: str) -> None:
                 if result.env_changed_reasons:
                     write("\n".join(f"- {reason}"
                                     for reason in result.env_changed_reasons))
+                if not result_cases:
+                    message = "\n".join([str(result),
+                                         *(result.env_changed_reasons or ())])
+                    github_annotation("error", result.test_name,
+                                      decolor(message))
                 for name, traceback in result_cases:
+                    github_annotation("error", f"{result.test_name}: {name}",
+                                      decolor(traceback))
                     # Expand short tracebacks when there are only a few
                     is_open = ncase <= 5 and traceback.count("\n") < 30
                     write(f"<details{' open' if is_open else ''}>"

Lib/test/libregrtest/results.py

@@ -1,14 +1,13 @@
-import os
 import sys
 import trace
-from _colorize import decolor, get_colors  # type: ignore[import-not-found]
+from _colorize import get_colors  # type: ignore[import-not-found]
 lazy from xml.etree.ElementTree import Element
 
 from .runtests import RunTests
 from .result import State, TestResult, TestStats, Location
 from .utils import (
     StrPath, TestName, TestTuple, TestList, FilterDict,
-    printlist, count, format_duration, github_annotation)
+    printlist, count, format_duration)
 
 
 # Python uses exit code 1 when an exception is not caught
@@ -20,16 +19,6 @@
 EXITCODE_INTERRUPTED = 130   # 128 + signal.SIGINT=2
 
 
-def annotate_github(result: TestResult) -> None:
-    cases = (result.errors or []) + (result.failures or [])
-    for name, traceback in cases:
-        github_annotation("error", f"{result.test_name}: {name}",
-                          decolor(traceback))
-    if not cases:
-        message = "\n".join([str(result), *(result.env_changed_reasons or ())])
-        github_annotation("error", result.test_name, decolor(message))
-
-
 class TestResults:
     def __init__(self) -> None:
         self.bad: TestList = []
@@ -139,11 +128,6 @@ def accumulate_result(self, result: TestResult, runtests: RunTests) -> None:
         if result.state == State.WORKER_BUG:
             self.worker_bug = True
 
-        if (os.environ.get("GITHUB_STEP_SUMMARY") and rerun
-                and result.is_failed(fail_env_changed)):
-            # Only annotate tests which fail again when re-run
-            annotate_github(result)
-
         if result.has_meaningful_duration() and not rerun:
             if result.duration is None:
                 raise ValueError("result.duration is None")