Move annotations before test output

Author: cmaloney

Lib/test/libregrtest/result.py

@@ -191,9 +191,7 @@ def escape(text: str) -> str:
         def escape_property(text: str) -> str:
             return escape(text).replace(":", "%3A").replace(",", "%2C")
 
-        annotations = [(f"{self.test_name}: {name}", traceback)
-                       for name, traceback in (self.errors or [])
-                                              + (self.failures or [])]
+        annotations = (self.errors or []) + (self.failures or [])
         if not annotations:
             # No test case details: crash, timeout, env changed, etc.
             message = "\n".join([str(self), *(self.env_changed_reasons or ())])

Lib/test/libregrtest/run_workers.py

@@ -613,6 +613,9 @@ def _process_result(self, item: QueueOutput) -> TestResult:
         result = mp_result.result
         self.results.accumulate_result(result, self.runtests)
         self.display_result(mp_result)
+        if self.runtests.rerun and result.is_failed(self.runtests.fail_env_changed):
+            # Annotate before the test output
+            result.print_github_annotations()
 
         # Display worker stdout
         if not self.runtests.output_on_failure:
@@ -624,8 +627,6 @@ def _process_result(self, item: QueueOutput) -> TestResult:
             stdout = mp_result.worker_stdout
             if stdout:
                 print(stdout, flush=True)
-        if self.runtests.rerun and result.is_failed(self.runtests.fail_env_changed):
-            result.print_github_annotations()
 
         return result