undo refactor into _get_error_message

Author: edgarrmondragon

plugin_test.py

@@ -221,7 +221,7 @@ def test_fail():
     result = testdir.runpytest_subprocess("--rootdir=foo")
     result.stderr.fnmatch_lines(
         [
-            "::error file=test_annotation_fail_cwd.py,line=5::test_fail*assert 0*",
+            "::error file=test_annotation_fail_cwd0/test_annotation_fail_cwd.py,line=5::test_fail*assert 0*",
         ]
     )
 

pytest_github_actions_annotate_failures/plugin.py

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING
 
 import pytest
-from _pytest._code.code import ExceptionRepr
+from _pytest._code.code import ExceptionRepr, ReprEntry
 from packaging import version
 
 if TYPE_CHECKING:
@@ -38,16 +38,33 @@ def pytest_runtest_makereport(item: Item, call):  # noqa: ARG001
         return
 
     if report.when == "call" and report.failed:
-        if report.location is None:
-            return
-
         filesystempath, lineno, _ = report.location
 
         if lineno is not None:
             # 0-index to 1-index
             lineno += 1
 
-        longrepr, lineno = _get_error_message(item, report, lineno)
+        longrepr = report.head_line or item.name
+
+        # get the error message and line number from the actual error
+        if isinstance(report.longrepr, ExceptionRepr):
+            if report.longrepr.reprcrash is not None:
+                longrepr += "\n\n" + report.longrepr.reprcrash.message
+            tb_entries = report.longrepr.reprtraceback.reprentries
+            if tb_entries:
+                entry = tb_entries[0]
+                # Handle third-party exceptions
+                if isinstance(entry, ReprEntry) and entry.reprfileloc is not None:
+                    lineno = entry.reprfileloc.lineno
+                    filesystempath = entry.reprfileloc.path
+
+            elif report.longrepr.reprcrash is not None:
+                lineno = report.longrepr.reprcrash.lineno
+        elif isinstance(report.longrepr, tuple):
+            filesystempath, lineno, message = report.longrepr
+            longrepr += "\n\n" + message
+        elif isinstance(report.longrepr, str):
+            longrepr += "\n\n" + report.longrepr
 
         workflow_command = _build_workflow_command(
             "error",
@@ -80,34 +97,6 @@ def compute_path(filesystempath: str) -> str:
     return filesystempath
 
 
-def _get_error_message(
-    item: Item,
-    report: CollectReport,
-    lineno: int | None,
-) -> tuple[str, int]:
-    """Extract error message and potentially updated line number from report."""
-    # get the name of the current failed test, with parametrize info
-    longrepr = report.head_line or item.name
-
-    # get the error message and line number from the actual error
-    if isinstance(report.longrepr, ExceptionRepr):
-        if report.longrepr.reprcrash is not None:
-            longrepr += "\n\n" + report.longrepr.reprcrash.message
-        tb_entries = report.longrepr.reprtraceback.reprentries
-        if len(tb_entries) > 1 and tb_entries[0].reprfileloc is not None:
-            # Handle third-party exceptions
-            lineno = tb_entries[0].reprfileloc.lineno
-        elif report.longrepr.reprcrash is not None:
-            lineno = report.longrepr.reprcrash.lineno
-    elif isinstance(report.longrepr, tuple):
-        _, lineno, message = report.longrepr
-        longrepr += "\n\n" + message
-    elif isinstance(report.longrepr, str):
-        longrepr += "\n\n" + report.longrepr
-
-    return longrepr, lineno
-
-
 class _AnnotateWarnings:
     def pytest_warning_recorded(self, warning_message, when, nodeid, location):  # noqa: ARG002
         # enable only in a workflow of GitHub Actions