More fixes: part 2

src/ansible_navigator/actions/collections.py

@@ -443,17 +443,13 @@ def _run_runner(self) -> None:
         if self._args.execution_environment:
             self._logger.debug("running collections command with execution environment enabled")
             python_exec_path = "/usr/bin/python3"
-            utils_lib = os.path.join(
-                os.path.dirname(__file__),
-                "..",
-                "utils",
-            )
+            utils_lib = Path(__file__).parent / ".." / "utils"
 
             container_volume_mounts = [
                 # cache directory which has introspection script
                 f"{cache_path}:{cache_path}",
                 # KVS library used by both Navigator and the introspection script
-                f"{utils_lib}:/opt/ansible_navigator_utils",
+                f"{utils_lib!s}:/opt/ansible_navigator_utils",
             ]
             if Path(self._adjacent_collection_dir).exists():
                 container_volume_mounts.append(

tests/integration/conftest.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import os
-
 from copy import deepcopy
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -39,12 +37,12 @@ def action_run_stdout() -> Generator[type[ActionRunTest], None, None]:
 
 
 @pytest.fixture(scope="session")
-def test_fixtures_dir() -> str:
+def test_fixtures_dir() -> Path:
     """Return the test fixture directory.
 
     :return: The test fixture directory.
     """
-    return os.path.join(os.path.dirname(__file__), "..", "fixtures")
+    return Path(__file__).parent / ".." / "fixtures"
 
 
 @pytest.fixture(scope="session")

tests/unit/utils/test_functions.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import os
 import re
 
 from pathlib import Path
@@ -32,10 +31,11 @@ def test_find_many_settings_home(monkeypatch: pytest.MonkeyPatch) -> None:
 
     :param monkeypatch: The monkeypatch fixture
     """
-    paths = [os.path.join(Path.home(), ".ansible-navigator" + ext) for ext in EXTENSIONS]
+    home_path = Path.home() / ".ansible-navigator"
+    paths = [Path(f"{home_path}{ext}") for ext in EXTENSIONS]
 
     def check_path_exists(arg: Any) -> bool:
-        return str(arg) in paths
+        return arg in paths
 
     monkeypatch.setattr(Path, "exists", check_path_exists)
     _messages, exit_messages, _found = find_settings_file()
@@ -48,10 +48,11 @@ def test_find_many_settings_cwd(monkeypatch: pytest.MonkeyPatch) -> None:
 
     :param monkeypatch: The monkeypatch fixture
     """
-    paths = [os.path.join(os.getcwd(), "ansible-navigator" + ext) for ext in EXTENSIONS]
+    cwd_path = Path.cwd() / "ansible-navigator"
+    paths = [Path(f"{cwd_path}{ext}") for ext in EXTENSIONS]
 
     def check_path_exists(arg: Any) -> bool:
-        return str(arg) in paths
+        return arg in paths
 
     monkeypatch.setattr(Path, "exists", check_path_exists)
     _messages, exit_messages, _found = find_settings_file()