Set GITHUB_ANNOTATIONS in setup_tests(), like USE_XML

Fall back to the first traceback frame (the test) instead of passing the
test module file.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: cmaloney

Lib/test/libregrtest/setup.py

@@ -112,9 +112,10 @@ def setup_tests(runtests: RunTests) -> None:
 
     set_match_tests(runtests.match_tests)
 
+    from .testresult import RegressionTestResult
+    RegressionTestResult.GITHUB_ANNOTATIONS = runtests.github_annotations
     if runtests.use_junit:
         support.junit_xml_list = []
-        from .testresult import RegressionTestResult
         RegressionTestResult.USE_XML = True
     else:
         support.junit_xml_list = None

Lib/test/libregrtest/single.py

@@ -16,7 +16,7 @@
 from .runtests import RunTests
 from .save_env import saved_test_environment
 from .setup import setup_tests
-from .testresult import RegressionTestResult, get_test_runner
+from .testresult import get_test_runner
 from .parallel_case import ParallelTestCase
 from .utils import (
     TestName,
@@ -37,8 +37,6 @@ def run_unittest(test_mod, runtests: RunTests):
     if loader.errors:
         raise Exception("errors while loading tests")
     _filter_suite(tests, match_test)
-    RegressionTestResult.GITHUB_TEST_FILE = (
-        test_mod.__file__ if runtests.github_annotations else None)
     if runtests.parallel_threads:
         _parallelize_tests(tests, runtests.parallel_threads)
     return _run_suite(tests)

Lib/test/libregrtest/testresult.py

@@ -13,8 +13,7 @@
 
 class RegressionTestResult(unittest.TextTestResult):
     USE_XML = False
-    # Test file of the GitHub Actions annotations: don't annotate if None
-    GITHUB_TEST_FILE: str | None = None
+    GITHUB_ANNOTATIONS = False
 
     def __init__(self, stream, descriptions, verbosity):
         super().__init__(stream=stream, descriptions=descriptions,
@@ -137,9 +136,8 @@ def printErrorList(self, flavour, errors):
             super().printErrorList(flavour, [(test, err)])
             # Annotate just after the failure report, so that the annotation
             # links to the report in the job log
-            if self.GITHUB_TEST_FILE:
-                print_github_annotation(str(test), err, self.GITHUB_TEST_FILE,
-                                        file=self.stream)
+            if self.GITHUB_ANNOTATIONS:
+                print_github_annotation(str(test), err, file=self.stream)
 
     def get_xml_element(self):
         if not self.USE_XML:

Lib/test/libregrtest/utils.py

@@ -148,22 +148,26 @@ def print_warning(msg: str) -> None:
                                                              ",": "%2C"})
 
 
-def print_github_annotation(title: str, message: str, filename: str,
-                            file=None) -> None:
+def print_github_annotation(title: str, message: str,
+                            filename: str | None = None, file=None) -> None:
     """Print a GitHub Actions error annotation.
 
     message is a traceback or a failure description. Only keep the exception
     which ends the traceback: the job log has the full traceback. Locate the
-    annotation at the last traceback frame in a test file, if any, or else
-    in filename, the test file.
+    annotation at the last traceback frame in a test file, or else at the
+    first frame (the test), or else in filename (the test file).
     """
     message = decolor(message)
     line = None
-    # Last traceback frame ('  File "filename", line 123') or failed doctest
-    # example (same, but not indented) in a test file
-    if frames := re.findall(r'^ *File "(.*[/\\]test_[^/\\]*\.py)", line (\d+)',
-                            message, re.MULTILINE):
-        filename, line = frames[-1]
+    # Traceback frames ('  File "filename", line 123') and failed doctest
+    # examples (same, but not indented)
+    if frames := re.findall(r'^ *File "(.*)", line (\d+)', message,
+                            re.MULTILINE):
+        test_frames = [frame for frame in frames
+                       if os.path.basename(frame[0]).startswith('test_')]
+        filename, line = test_frames[-1] if test_frames else frames[0]
+    if not filename:
+        raise ValueError(f"missing test file of annotation {title!r}")
     # In the job, the stdlib can be outside of the repository checkout
     path = pathlib.Path(filename)
     stdlib_dir = pathlib.Path(os.__file__).parent