refactor into __get_error_message

Author: edgarrmondragon

pytest_github_actions_annotate_failures/plugin.py

@@ -39,25 +39,7 @@ def pytest_runtest_makereport(item: Item, call):  # noqa: ARG001
 
     if report.when == "call" and report.failed:
         filesystempath, lineno = _get_location_info(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
+        longrepr, lineno = _get_error_message(item, report, lineno)
 
         workflow_command = _build_workflow_command(
             "error",
@@ -94,6 +76,29 @@ def _get_location_info(report: CollectReport) -> tuple[str, int | None]:
 
     return filesystempath, lineno
 
+def _get_error_message(item: Item, report: CollectReport, lineno: int | None) -> tuple[str, int | None]:
+    """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