nixos/test-driver: apply ruff check suggestions

This commit is contained in:
Nick Cao
2024-11-22 09:16:03 -05:00
parent 9069a281a7
commit b25360a7e5
3 changed files with 48 additions and 45 deletions

View File

@@ -3,9 +3,10 @@ import re
import signal
import tempfile
import threading
from contextlib import contextmanager
from collections.abc import Iterator
from contextlib import AbstractContextManager, contextmanager
from pathlib import Path
from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union
from typing import Any, Callable, Optional, Union
from colorama import Fore, Style
@@ -44,17 +45,17 @@ class Driver:
and runs the tests"""
tests: str
vlans: List[VLan]
machines: List[Machine]
polling_conditions: List[PollingCondition]
vlans: list[VLan]
machines: list[Machine]
polling_conditions: list[PollingCondition]
global_timeout: int
race_timer: threading.Timer
logger: AbstractLogger
def __init__(
self,
start_scripts: List[str],
vlans: List[int],
start_scripts: list[str],
vlans: list[int],
tests: str,
out_dir: Path,
logger: AbstractLogger,
@@ -73,7 +74,7 @@ class Driver:
vlans = list(set(vlans))
self.vlans = [VLan(nr, tmp_dir, self.logger) for nr in vlans]
def cmd(scripts: List[str]) -> Iterator[NixStartScript]:
def cmd(scripts: list[str]) -> Iterator[NixStartScript]:
for s in scripts:
yield NixStartScript(s)
@@ -119,7 +120,7 @@ class Driver:
self.logger.error(f'Test "{name}" failed with error: "{e}"')
raise e
def test_symbols(self) -> Dict[str, Any]:
def test_symbols(self) -> dict[str, Any]:
@contextmanager
def subtest(name: str) -> Iterator[None]:
return self.subtest(name)
@@ -277,7 +278,7 @@ class Driver:
*,
seconds_interval: float = 2.0,
description: Optional[str] = None,
) -> Union[Callable[[Callable], ContextManager], ContextManager]:
) -> Union[Callable[[Callable], AbstractContextManager], AbstractContextManager]:
driver = self
class Poll: