tox.ini: make lint match pre-commit rules

Signed-off-by: Albert Esteve <[email protected]>

Author: aesteve-rh

oci-hooks/tests/test_hook_configs.py

@@ -242,13 +242,10 @@ def test_hook_executable_exists(self, hook_configs, hook_name):
             # If absolute path fails, try relative to config file
             hook_path = config_path.parent / hook_path.name
 
-            # Special case: seat manager uses the shared device manager executable
+            # Special case: seat manager uses shared device manager executable
             if not hook_path.exists() and hook_name == "oci-qm-seat-manager":
-                hook_path = (
-                    config_path.parent.parent
-                    / "qm-device-manager"
-                    / hook_path.name
-                )
+                parent_dir = config_path.parent.parent
+                hook_path = parent_dir / "qm-device-manager" / hook_path.name
 
         assert hook_path.exists(), f"Hook executable not found: {hook_path}"
         assert hook_path.is_file(), f"Hook executable not a file: {hook_path}"
@@ -404,16 +401,13 @@ def test_hook_config_integration(self, hook_configs, hook_name):
             # If absolute path fails, try relative to config directory
             full_hook_path = config_path.parent / Path(hook_path).name
 
-            # Special case: seat manager uses the shared device manager executable
-            if (
-                not full_hook_path.exists()
-                and hook_name == "oci-qm-seat-manager"
-            ):
-                full_hook_path = (
-                    config_path.parent.parent
-                    / "qm-device-manager"
-                    / Path(hook_path).name
-                )
+            # Special case: seat manager uses shared device manager executable
+            is_seat_manager = hook_name == "oci-qm-seat-manager"
+            if not full_hook_path.exists() and is_seat_manager:
+                parent_dir = config_path.parent.parent
+                hook_name_path = Path(hook_path).name
+                device_mgr_dir = parent_dir / "qm-device-manager"
+                full_hook_path = device_mgr_dir / hook_name_path
 
         # Check that executable exists
         assert full_hook_path.exists(), (

oci-hooks/tox.ini

@@ -48,12 +48,12 @@ commands =
 
 [testenv:lint]
 deps =
-    black
+    flake8
     pylint
     shellcheck-py
 allowlist_externals = shfmt
 commands =
-    black --check --diff --line-length 79 tests/
+    flake8 -j8 --ignore=W503 tests/
     pylint --rcfile=tests/.pylintrc tests/*.py
     shellcheck qm-device-manager/oci-qm-device-manager
     shellcheck wayland-client-devices/oci-qm-wayland-client-devices
@@ -79,4 +79,4 @@ commands =
 
 [flake8]
 max-line-length = 79
-extend-ignore = E203, W503
+ignore = W503