refactor into _get_location_info

Author: edgarrmondragon

pytest_github_actions_annotate_failures/plugin.py

@@ -1,4 +1,3 @@
-
 from __future__ import annotations
 
 import contextlib
@@ -39,30 +38,7 @@ def pytest_runtest_makereport(item: Item, call):  # noqa: ARG001
         return
 
     if report.when == "call" and report.failed:
-        # collect information to be annotated
-        filesystempath, lineno, _ = report.location
-
-        runpath = os.environ.get("PYTEST_RUN_PATH")
-        if runpath:
-            filesystempath = os.path.join(runpath, filesystempath)
-
-        # try to convert to absolute path in GitHub Actions
-        workspace = os.environ.get("GITHUB_WORKSPACE")
-        if workspace:
-            full_path = os.path.abspath(filesystempath)
-            try:
-                rel_path = os.path.relpath(full_path, workspace)
-            except ValueError:
-                # os.path.relpath() will raise ValueError on Windows
-                # when full_path and workspace have different mount points.
-                # https://github.com/utgwkk/pytest-github-actions-annotate-failures/issues/20
-                rel_path = filesystempath
-            if not rel_path.startswith(".."):
-                filesystempath = rel_path
-
-        if lineno is not None:
-            # 0-index to 1-index
-            lineno += 1
+        filesystempath, lineno = _get_location_info(report)
 
         # get the name of the current failed test, with parametrize info
         longrepr = report.head_line or item.name
@@ -91,6 +67,33 @@ def pytest_runtest_makereport(item: Item, call):  # noqa: ARG001
         )
         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
+
+    runpath = os.environ.get("PYTEST_RUN_PATH")
+    if runpath:
+        filesystempath = os.path.join(runpath, filesystempath)
+
+    # try to convert to absolute path in GitHub Actions
+    workspace = os.environ.get("GITHUB_WORKSPACE")
+    if workspace:
+        full_path = os.path.abspath(filesystempath)
+        try:
+            rel_path = os.path.relpath(full_path, workspace)
+        except ValueError:
+            # os.path.relpath() will raise ValueError on Windows
+            # when full_path and workspace have different mount points.
+            rel_path = filesystempath
+        if not rel_path.startswith(".."):
+            filesystempath = rel_path
+
+    if lineno is not None:
+        # 0-index to 1-index
+        lineno += 1
+
+    return filesystempath, lineno
+
 
 class _AnnotateWarnings:
     def pytest_warning_recorded(self, warning_message, when, nodeid, location):  # noqa: ARG002