simplify and rename _get_location_info

Author: edgarrmondragon

pytest_github_actions_annotate_failures/plugin.py

@@ -38,21 +38,28 @@ def pytest_runtest_makereport(item: Item, call):  # noqa: ARG001
         return
 
     if report.when == "call" and report.failed:
-        filesystempath, lineno = _get_location_info(report)
+        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)
 
         workflow_command = _build_workflow_command(
             "error",
-            filesystempath,
+            compute_path(filesystempath),
             lineno,
             message=longrepr,
         )
         print(workflow_command, file=sys.stderr)
 
-def _get_location_info(report: CollectReport) -> tuple[str, int | None]:
-    """Extract and process location information from the report."""
-    filesystempath, lineno, _ = report.location
 
+def compute_path(filesystempath: str) -> str:
+    """Extract and process location information from the report."""
     runpath = os.environ.get("PYTEST_RUN_PATH")
     if runpath:
         filesystempath = os.path.join(runpath, filesystempath)
@@ -70,13 +77,14 @@ def _get_location_info(report: CollectReport) -> tuple[str, int | None]:
         if not rel_path.startswith(".."):
             filesystempath = rel_path
 
-    if lineno is not None:
-        # 0-index to 1-index
-        lineno += 1
+    return filesystempath
 
-    return filesystempath, lineno
 
-def _get_error_message(item: Item, report: CollectReport, lineno: int | None) -> tuple[str, int | None]:
+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