Make cwd use pathlib (#3383)

conftest.py

@@ -5,12 +5,13 @@
 import subprocess
 import sys
 import warnings
+from pathlib import Path
 
 import pytest
 
 # Ensure we always run from the root of the repository
-if os.getcwd() != os.path.dirname(__file__):
-    os.chdir(os.path.dirname(__file__))
+if Path.cwd() != Path(__file__).parent:
+    os.chdir(Path(__file__).parent)
 
 # checking if user is running pytest without installing test dependencies:
 missing = []

src/ansiblelint/__main__.py

@@ -311,7 +311,7 @@ def _previous_revision() -> Iterator[None]:
         stderr=subprocess.DEVNULL,
     )
     try:
-        with cwd(worktree_dir):
+        with cwd(pathlib.Path(worktree_dir)):
             subprocess.run(
                 [*GIT_CMD, "checkout", revision],  # noqa: S603
                 stdout=subprocess.DEVNULL,

src/ansiblelint/file_utils.py

@@ -101,9 +101,9 @@ def normpath_path(path: str | Path) -> Path:
 
 
 @contextmanager
-def cwd(path: str | Path) -> Iterator[None]:
+def cwd(path: Path) -> Iterator[None]:
     """Context manager for temporary changing current working directory."""
-    old_pwd = os.getcwd()
+    old_pwd = Path.cwd()
     os.chdir(path)
     try:
         yield

test/conftest.py

@@ -1,10 +1,8 @@
 """PyTest fixtures for testing the project."""
 from __future__ import annotations
 
-import os
 import shutil
 import subprocess
-from contextlib import contextmanager
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -15,24 +13,11 @@
 from ansiblelint.yaml_utils import FormattedYAML
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
-
     from _pytest import nodes
     from _pytest.config import Config
     from _pytest.config.argparsing import Parser
 
 
-@contextmanager
-def cwd(path: str) -> Iterator[None]:
-    """Context manager for chdir."""
-    old_pwd = os.getcwd()
-    os.chdir(path)
-    try:
-        yield
-    finally:
-        os.chdir(old_pwd)
-
-
 def pytest_addoption(parser: Parser) -> None:
     """Add --regenerate-formatting-fixtures option to pytest."""
     parser.addoption(

test/test_file_utils.py

@@ -13,6 +13,7 @@
 from ansiblelint.__main__ import initialize_logger
 from ansiblelint.file_utils import (
     Lintable,
+    cwd,
     expand_path_vars,
     expand_paths_vars,
     find_project_root,
@@ -21,8 +22,6 @@
 )
 from ansiblelint.runner import Runner
 
-from .conftest import cwd
-
 if TYPE_CHECKING:
     from _pytest.capture import CaptureFixture
     from _pytest.logging import LogCaptureFixture
@@ -310,7 +309,7 @@ def mockreturn(options: Options) -> dict[str, Any]:  # noqa: ARG001
 def test_find_project_root_1(tmp_path: Path) -> None:
     """Verify find_project_root()."""
     # this matches black behavior in absence of any config files or .git/.hg  folders.
-    with cwd(str(tmp_path)):
+    with cwd(tmp_path):
         path, method = find_project_root([])
         assert str(path) == "/"
         assert method == "file system root"
@@ -321,7 +320,7 @@ def test_find_project_root_dotconfig() -> None:
     # this expects to return examples folder as project root because this
     # folder already has an .config/ansible-lint.yml file inside, which should
     # be enough.
-    with cwd("examples"):
+    with cwd(Path("examples")):
         assert os.path.exists(
             ".config/ansible-lint.yml",
         ), "Test requires config file inside .config folder."
@@ -567,7 +566,7 @@ def test_bug_2513(
     os.makedirs(os.path.dirname(os.path.expanduser(filename)), exist_ok=True)
     lintable = Lintable(filename, content="---\n- hosts: all\n")
     lintable.write(force=True)
-    with cwd(str(tmp_path)):
+    with cwd(tmp_path):
         results = Runner(filename, rules=default_rules_collection).run()
         assert len(results) == 1
         assert results[0].rule.id == "name"