[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Pytest conftest file for CNV tests
 """
@@ -704,10 +703,9 @@ def pytest_runtest_makereport(item, call):
 
         elif report.failed:
             if reprcrash := getattr(report.longrepr, "reprcrash", None):
-                if message := getattr(report.longrepr, "message", None):
-                    setattr(report, SETUP_ERROR, message)
-
-                elif message := getattr(reprcrash, "message", None):
+                if (message := getattr(report.longrepr, "message", None)) or (
+                    message := getattr(reprcrash, "message", None)
+                ):
                     setattr(report, SETUP_ERROR, message)
 
 
@@ -902,7 +900,7 @@ def is_skip_must_gather(node: Node) -> bool:
 
 def get_inspect_command_namespace_string(node: Node, test_name: str) -> str:
     namespace_str = ""
-    components = [key for key in NAMESPACE_COLLECTION.keys() if f"tests/{key}/" in test_name]
+    components = [key for key in NAMESPACE_COLLECTION if f"tests/{key}/" in test_name]
     if not components:
         LOGGER.warning(f"{test_name} does not require special data collection on failure")
     else:

libs/net/netattachdef.py

@@ -35,7 +35,7 @@ class IpamStatic(Ipam):
     """
 
     type: str = field(default="static", init=False)
-    addresses: list["IpamStatic.Address"]
+    addresses: list[IpamStatic.Address]
     routes: list[IpamRoute] | None = None
 
     @dataclass
@@ -61,7 +61,7 @@ class CNIPluginBridgeConfig(CNIPluginConfig):
     mtu: int | None = None
     vlan: int | None = None
     macspoofchk: bool | None = None
-    disableContainerInterface: bool | None = None  # noqa: N815
+    disableContainerInterface: bool | None = None
 
 
 @dataclass
@@ -76,8 +76,8 @@ class CNIPluginOvnK8sConfig(CNIPluginConfig):
 
     type: str = field(default="ovn-k8s-cni-overlay", init=False)
     topology: str
-    netAttachDefName: str  # noqa: N815
-    vlanID: int | None = None  # noqa: N815
+    netAttachDefName: str
+    vlanID: int | None = None
     subnets: str | None = None
 
     class Topology(Enum):
@@ -106,7 +106,7 @@ class NetConfig:
 
     name: str
     plugins: list[CNIPluginConfig]
-    cniVersion: str = _DEFAULT_CNI_VERSION  # noqa: N815
+    cniVersion: str = _DEFAULT_CNI_VERSION
 
 
 class NetworkAttachmentDefinition(NamespacedResource):

libs/net/traffic_generator.py

@@ -1,7 +1,8 @@
 import contextlib
 import logging
 from abc import ABC, abstractmethod
-from typing import Final, Generator
+from collections.abc import Generator
+from typing import Final
 
 from ocp_resources.pod import Pod
 from ocp_utilities.exceptions import CommandExecFailed
@@ -32,7 +33,7 @@ def server_ip(self) -> str:
         return self._server_ip
 
     @abstractmethod
-    def __enter__(self) -> "BaseTcpClient":
+    def __enter__(self) -> BaseTcpClient:
         pass
 
     @abstractmethod
@@ -66,7 +67,7 @@ def __init__(
         self._cmd = f"{_IPERF_BIN} --server --port {self._port} --one-off"
         self._cmd += f" --bind {bind_ip}" if bind_ip else ""
 
-    def __enter__(self) -> "TcpServer":
+    def __enter__(self) -> TcpServer:
         self._vm.console(
             commands=[f"{self._cmd} &"],
             timeout=_DEFAULT_CMD_TIMEOUT_SEC,
@@ -113,7 +114,7 @@ def __init__(
         self._vm = vm
         self._cmd += f" --set-mss {maximum_segment_size}" if maximum_segment_size else ""
 
-    def __enter__(self) -> "VMTcpClient":
+    def __enter__(self) -> VMTcpClient:
         self._vm.console(
             commands=[f"{self._cmd} &"],
             timeout=_DEFAULT_CMD_TIMEOUT_SEC,
@@ -174,7 +175,7 @@ def __init__(self, pod: Pod, server_ip: str, server_port: int, bind_interface: s
         self._container = _IPERF_BIN
         self._cmd += f" --bind {bind_interface}" if bind_interface else ""
 
-    def __enter__(self) -> "PodTcpClient":
+    def __enter__(self) -> PodTcpClient:
         # run the command in the background using nohup to ensure it keeps running after the exec session ends
         self._pod.execute(
             command=["sh", "-c", f"nohup {self._cmd} >/tmp/{_IPERF_BIN}.log 2>&1 &"], container=self._container
@@ -204,7 +205,7 @@ def active_tcp_connections(
     client_vm: BaseVirtualMachine,
     server_vm: BaseVirtualMachine,
     iface_name: str,
-) -> Generator[list[tuple[VMTcpClient, TcpServer]], None, None]:
+) -> Generator[list[tuple[VMTcpClient, TcpServer]]]:
     """Start iperf3 client-server connections for all IPs on the server's interface.
        The helper assumed the ip addresses are up.
 
@@ -242,7 +243,7 @@ def client_server_active_connection(
     port: int = IPERF_SERVER_PORT,
     maximum_segment_size: int = 0,
     ip_family: int = 4,
-) -> Generator[tuple[VMTcpClient, TcpServer], None, None]:
+) -> Generator[tuple[VMTcpClient, TcpServer]]:
     """Start iperf3 client-server connection with continuous TCP traffic flow.
 
     Automatically starts an iperf3 server and client, with traffic flowing continuously
@@ -265,11 +266,13 @@ def client_server_active_connection(
         Traffic runs with infinite duration until context exits.
     """
     server_ip = str(lookup_iface_status_ip(vm=server_vm, iface_name=spec_logical_network, ip_family=ip_family))
-    with TcpServer(vm=server_vm, port=port, bind_ip=server_ip) as server:
-        with VMTcpClient(
+    with (
+        TcpServer(vm=server_vm, port=port, bind_ip=server_ip) as server,
+        VMTcpClient(
             vm=client_vm,
             server_ip=server_ip,
             server_port=port,
             maximum_segment_size=maximum_segment_size,
-        ) as client:
-            yield client, server
+        ) as client,
+    ):
+        yield client, server

libs/storage/config.py

@@ -26,7 +26,7 @@ def __init__(self, name: str):
         self.name = name
         self.storage_config = self.get_storage_config()
 
-    def supported_storage_classes(self) -> list["StorageClass"]:
+    def supported_storage_classes(self) -> list[StorageClass]:
         return [
             StorageClass(
                 name=StorageClassNames.CEPH_RBD_VIRTUALIZATION,

libs/vm/spec.py

@@ -9,7 +9,7 @@
 @dataclass
 class VMSpec:
     template: Template
-    runStrategy: str = VirtualMachine.RunStrategy.HALTED  # noqa: N815
+    runStrategy: str = VirtualMachine.RunStrategy.HALTED
 
 
 @dataclass
@@ -29,7 +29,7 @@ class VMISpec:
     domain: Domain
     networks: list[Network] | None = None
     volumes: list[Volume] | None = None
-    terminationGracePeriodSeconds: int | None = None  # noqa: N815
+    terminationGracePeriodSeconds: int | None = None
     affinity: Affinity | None = None
 
 
@@ -74,7 +74,7 @@ class Interface:
     masquerade: dict[Any, Any] | None = None
     bridge: dict[Any, Any] | None = None
     sriov: dict[Any, Any] | None = None
-    passtBinding: dict[Any, Any] | None = None  # noqa: N815
+    passtBinding: dict[Any, Any] | None = None
     binding: NetBinding | None = None
     state: str | None = None
 
@@ -93,30 +93,30 @@ class Network:
 
 @dataclass
 class Multus:
-    networkName: str  # noqa: N815
+    networkName: str
 
 
 @dataclass
 class Affinity:
-    podAntiAffinity: PodAntiAffinity  # noqa: N815
+    podAntiAffinity: PodAntiAffinity
 
 
 @dataclass
 class PodAntiAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution: list[PodAffinityTerm]  # noqa: N815
+    requiredDuringSchedulingIgnoredDuringExecution: list[PodAffinityTerm]
 
 
 @dataclass
 class PodAffinityTerm:
-    labelSelector: LabelSelector  # noqa: N815
-    topologyKey: str  # noqa: N815
-    namespaceSelector: dict[str, Any] | None = None  # noqa: N815
+    labelSelector: LabelSelector
+    topologyKey: str
+    namespaceSelector: dict[str, Any] | None = None
     namespaces: list[str] | None = None
 
 
 @dataclass
 class LabelSelector:
-    matchExpressions: list[LabelSelectorRequirement]  # noqa: N815
+    matchExpressions: list[LabelSelectorRequirement]
 
 
 @dataclass
@@ -129,8 +129,8 @@ class LabelSelectorRequirement:
 @dataclass
 class Volume:
     name: str
-    containerDisk: ContainerDisk | None = None  # noqa: N815
-    cloudInitNoCloud: CloudInitNoCloud | None = None  # noqa: N815
+    containerDisk: ContainerDisk | None = None
+    cloudInitNoCloud: CloudInitNoCloud | None = None
 
 
 @dataclass
@@ -140,5 +140,5 @@ class ContainerDisk:
 
 @dataclass
 class CloudInitNoCloud:
-    networkData: str  # noqa: N815
-    userData: str | None = None  # noqa: N815
+    networkData: str
+    userData: str | None = None

scripts/tests_analyzer/pytest_marker_analyzer.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env -S uv run python
 
-# flake8: noqa: N802
 
 """
 Pytest Marker Analyzer
@@ -949,10 +948,9 @@ def _process_test_file_for_markers(
                 if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
                     if node.name.startswith("test_"):
                         for decorator in node.decorator_list:
-                            if is_marker(decorator=decorator, marker_names=marker_names):
-                                tests.append(node.name)
-                                break
-                            elif check_parametrize_marks(decorator=decorator, marker_names=marker_names):
+                            if is_marker(decorator=decorator, marker_names=marker_names) or check_parametrize_marks(
+                                decorator=decorator, marker_names=marker_names
+                            ):
                                 tests.append(node.name)
                                 break
                 elif isinstance(node, ast.ClassDef):
@@ -971,10 +969,9 @@ def _process_test_file_for_markers(
                             if isinstance(item, (ast.FunctionDef, ast.AsyncFunctionDef)):
                                 if item.name.startswith("test_"):
                                     for decorator in item.decorator_list:
-                                        if is_marker(decorator=decorator, marker_names=marker_names):
-                                            tests.append(f"{node.name}::{item.name}")
-                                            break
-                                        elif check_parametrize_marks(decorator=decorator, marker_names=marker_names):
+                                        if is_marker(
+                                            decorator=decorator, marker_names=marker_names
+                                        ) or check_parametrize_marks(decorator=decorator, marker_names=marker_names):
                                             tests.append(f"{node.name}::{item.name}")
                                             break
 
@@ -2294,9 +2291,7 @@ def _check_test_impact(
                             narrowed_func_symbols: set[str] = set()
                             for sym in common_symbols:
                                 # Keep class symbols (already handled by member narrowing above)
-                                if sym in classification.modified_members:
-                                    narrowed_func_symbols.add(sym)
-                                elif sym in test_calls:
+                                if sym in classification.modified_members or sym in test_calls:
                                     narrowed_func_symbols.add(sym)
                                 elif sym[0].isupper():
                                     # Uppercase = likely a class name — keep conservatively
@@ -3093,11 +3088,9 @@ def _extract_marked_tests_from_file(self, file_path: Path) -> list[str]:
                     # Module-level function with marker
                     if node.name.startswith("test_"):
                         for decorator in node.decorator_list:
-                            if is_marker(decorator=decorator, marker_names=self.marker_names):
-                                tests.append(node.name)
-                                break
-                            # Also check for markers in parametrize pytest.param(..., marks=...)
-                            elif check_parametrize_marks(decorator=decorator, marker_names=self.marker_names):
+                            if is_marker(
+                                decorator=decorator, marker_names=self.marker_names
+                            ) or check_parametrize_marks(decorator=decorator, marker_names=self.marker_names):
                                 tests.append(node.name)
                                 break
 
@@ -3122,11 +3115,9 @@ def _extract_marked_tests_from_file(self, file_path: Path) -> list[str]:
                                 if item.name.startswith("test_"):
                                     # Check method-level markers
                                     for decorator in item.decorator_list:
-                                        if is_marker(decorator=decorator, marker_names=self.marker_names):
-                                            tests.append(f"{node.name}::{item.name}")
-                                            break
-                                        # Also check parametrize marks
-                                        elif check_parametrize_marks(
+                                        if is_marker(
+                                            decorator=decorator, marker_names=self.marker_names
+                                        ) or check_parametrize_marks(
                                             decorator=decorator, marker_names=self.marker_names
                                         ):
                                             tests.append(f"{node.name}::{item.name}")

tests/chaos/oadp/conftest.py

@@ -76,7 +76,6 @@ def rebooted_vm_source_node(rhel_vm_with_dv_running, oadp_backup_in_progress, wo
 
     LOGGER.info(f"Waiting for node {vm_node.name} to come back online")
     wait_for_node_status(node=vm_node, status=True, wait_timeout=TIMEOUT_10MIN)
-    return
 
 
 @pytest.fixture()

tests/conftest.py

@@ -14,7 +14,7 @@
 import tempfile
 from bisect import bisect_left
 from collections import defaultdict
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from signal import SIGINT, SIGTERM, getsignal, signal
 from subprocess import check_output
 
@@ -266,7 +266,7 @@ def session_start_time() -> datetime:
     Returns:
         datetime: UTC timestamp when test session began (timezone-naive)
     """
-    return datetime.now(timezone.utc).replace(tzinfo=None)
+    return datetime.now(UTC).replace(tzinfo=None)
 
 
 @pytest.fixture(scope="session")
@@ -2311,16 +2311,16 @@ def rhel_vm_with_instance_type_and_preference(
     with (
         instance_type_for_test_scope_class as vm_instance_type,
         vm_preference_for_test as vm_preference,
-    ):
-        with VirtualMachineForTests(
+        VirtualMachineForTests(
             client=unprivileged_client,
             name="rhel-vm-with-instance-type",
             namespace=namespace.name,
             image=Images.Rhel.RHEL9_REGISTRY_GUEST_IMG,
             vm_instance_type=vm_instance_type,
             vm_preference=vm_preference,
-        ) as vm:
-            yield vm
+        ) as vm,
+    ):
+        yield vm
 
 
 @pytest.fixture(scope="session")

tests/global_config_amd64.py

@@ -31,4 +31,4 @@
     if _dir in ["encoding", "py_file"]:
         continue
 
-    config[_dir] = locals()[_dir]  # noqa: F821
+    config[_dir] = locals()[_dir]

tests/global_config_arm64.py

@@ -63,4 +63,4 @@
     if _dir in ["encoding", "py_file"]:
         continue
 
-    config[_dir] = locals()[_dir]  # noqa: F821
+    config[_dir] = locals()[_dir]