Address ruff PTH118: part2 (ansible#1802)

shatakshiiii · Jun 15, 2024 · 54bebf6 · 54bebf6
1 parent 08cae46
commit 54bebf6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/tests/integration/actions/lint/base.py b/tests/integration/actions/lint/base.py
@@ -22,12 +22,8 @@
     from collections.abc import Generator
 
 
-LINT_FIXTURES = os.path.join(
-    FIXTURES_DIR,
-    "integration",
-    "actions",
-    "lint",
-)
+# LINT_FIXTURES = f"{FIXTURES_DIR / 'integration' / 'actions' / 'lint'}"
+LINT_FIXTURES = FIXTURES_DIR / "integration" / "actions" / "lint"
 
 
 class BaseClass:

diff --git a/tests/integration/actions/lint/test_direct_interactive_ee.py b/tests/integration/actions/lint/test_direct_interactive_ee.py
@@ -11,7 +11,7 @@
 from .base import BaseClass
 
 
-CLI = Command(subcommand="lint", cmdline=LINT_FIXTURES, execution_environment=True).join()
+CLI = Command(subcommand="lint", cmdline=str(LINT_FIXTURES), execution_environment=True).join()
 
 steps: tuple[UiTestStep, ...] = (
     UiTestStep(

diff --git a/tests/integration/actions/lint/test_direct_interactive_no_errors_ee.py b/tests/integration/actions/lint/test_direct_interactive_no_errors_ee.py
@@ -1,7 +1,5 @@
 """Tests for lint (with no errors) from CLI, interactive, with an EE."""
 
-import os
-
 import pytest
 
 from tests.integration._interactions import Command
@@ -15,10 +13,7 @@
 
 CLI = Command(
     subcommand="lint",
-    cmdline=os.path.join(
-        LINT_FIXTURES,
-        "no_errors",
-    ),
+    cmdline=f"{LINT_FIXTURES / 'no_errors'}",
     execution_environment=True,
 ).join()
 

diff --git a/tests/integration/actions/lint/test_direct_interactive_noee.py b/tests/integration/actions/lint/test_direct_interactive_noee.py
@@ -11,7 +11,7 @@
 from .base import BaseClass
 
 
-CLI = Command(subcommand="lint", cmdline=LINT_FIXTURES, execution_environment=False).join()
+CLI = Command(subcommand="lint", cmdline=str(LINT_FIXTURES), execution_environment=False).join()
 
 steps: tuple[UiTestStep, ...] = (
     UiTestStep(

diff --git a/tests/integration/actions/lint/test_stdout_tmux.py b/tests/integration/actions/lint/test_stdout_tmux.py
@@ -1,7 +1,5 @@
 """Tests for ``lint`` from CLI, stdout."""
 
-import os
-
 import pytest
 
 from tests.integration._interactions import Command
@@ -18,8 +16,8 @@
         comment="lint stdout with errors",
         user_input=Command(
             subcommand="lint",
-            cmdline=LINT_FIXTURES,
-            precommand=f"cd {os.path.join(LINT_FIXTURES, '..')} ; ",
+            cmdline=str(LINT_FIXTURES),
+            precommand=f"cd {LINT_FIXTURES / '..'} ; ",
             mode="stdout",
             execution_environment=True,
             preclear=True,
@@ -31,7 +29,7 @@
         comment="lint stdout with no errors",
         user_input=Command(
             subcommand="lint",
-            cmdline=os.path.join(LINT_FIXTURES, "no_errors"),
+            cmdline=f"{LINT_FIXTURES / 'no_errors'}",
             mode="stdout",
             execution_environment=True,
         ).join(),