diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2023-09-30 10:18:47 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2023-09-30 10:31:22 +0200 |
commit | a1f01abe53e9b20965df7b6c929bc2a129052551 (patch) | |
tree | a566fdd0ef43388bb7ae4b5baffdc5b8c3b07c4e /nixos/lib | |
parent | 93b1fa09d52970b449b36b8649b2831dad08604e (diff) |
nixos/test-driver: apply ruff fixes & suggestions
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/test-driver/extract-docstrings.py | 10 | ||||
-rwxr-xr-x | nixos/lib/test-driver/test_driver/__init__.py | 11 | ||||
-rw-r--r-- | nixos/lib/test-driver/test_driver/driver.py | 8 | ||||
-rw-r--r-- | nixos/lib/test-driver/test_driver/logger.py | 11 | ||||
-rw-r--r-- | nixos/lib/test-driver/test_driver/machine.py | 12 | ||||
-rw-r--r-- | nixos/lib/test-driver/test_driver/polling_condition.py | 4 | ||||
-rw-r--r-- | nixos/lib/test-driver/test_driver/vlan.py | 2 |
7 files changed, 29 insertions, 29 deletions
diff --git a/nixos/lib/test-driver/extract-docstrings.py b/nixos/lib/test-driver/extract-docstrings.py index a12e586882a67..64850ca711f3b 100644 --- a/nixos/lib/test-driver/extract-docstrings.py +++ b/nixos/lib/test-driver/extract-docstrings.py @@ -59,15 +59,15 @@ def main() -> None: ] function_definitions.sort(key=lambda x: x.name) - for f in function_definitions: - docstr = ast.get_docstring(f) + for function in function_definitions: + docstr = ast.get_docstring(function) if docstr is not None: - args = ", ".join(a.arg for a in f.args.args[1:]) + args = ", ".join(a.arg for a in function.args.args[1:]) args = f"({args})" - docstr = "\n".join(f" {l}" for l in docstr.strip().splitlines()) + docstr = "\n".join(f" {line}" for line in docstr.strip().splitlines()) - print(f"{f.name}{args}\n\n:{docstr[1:]}\n") + print(f"{function.name}{args}\n\n:{docstr[1:]}\n") if __name__ == "__main__": diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index c90e3d9e1cdb6..371719d7a9884 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -1,11 +1,12 @@ -from pathlib import Path import argparse -import ptpython.repl import os import time +from pathlib import Path + +import ptpython.repl -from test_driver.logger import rootlog from test_driver.driver import Driver +from test_driver.logger import rootlog class EnvDefault(argparse.Action): @@ -25,9 +26,7 @@ class EnvDefault(argparse.Action): ) if required and default: required = False - super(EnvDefault, self).__init__( - default=default, required=required, nargs=nargs, **kwargs - ) + super().__init__(default=default, required=required, nargs=nargs, **kwargs) def __call__(self, parser, namespace, values, option_string=None): # type: ignore setattr(namespace, self.dest, values) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 835d60ec3b4fd..723c807178607 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -1,14 +1,14 @@ -from contextlib import contextmanager -from pathlib import Path -from typing import Any, Dict, Iterator, List, Union, Optional, Callable, ContextManager import os import re import tempfile +from contextlib import contextmanager +from pathlib import Path +from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union from test_driver.logger import rootlog from test_driver.machine import Machine, NixStartScript, retry -from test_driver.vlan import VLan from test_driver.polling_condition import PollingCondition +from test_driver.vlan import VLan def get_tmp_dir() -> Path: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index ea14c50dc517f..116244b5e4ae0 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -1,16 +1,17 @@ # mypy: disable-error-code="no-untyped-call" # drop the above line when mypy is upgraded to include # https://github.com/python/typeshed/commit/49b717ca52bf0781a538b04c0d76a5513f7119b8 -from colorama import Style, Fore -from contextlib import contextmanager -from typing import Any, Dict, Iterator -from queue import Queue, Empty -from xml.sax.saxutils import XMLGenerator import codecs import os import sys import time import unicodedata +from contextlib import contextmanager +from queue import Empty, Queue +from typing import Any, Dict, Iterator +from xml.sax.saxutils import XMLGenerator + +from colorama import Fore, Style class Logger: diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 4accd2f9d1950..5ee842450606d 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -1,7 +1,3 @@ -from contextlib import _GeneratorContextManager, nullcontext -from pathlib import Path -from queue import Queue -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple import base64 import io import os @@ -16,6 +12,10 @@ import sys import tempfile import threading import time +from contextlib import _GeneratorContextManager, nullcontext +from pathlib import Path +from queue import Queue +from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple from test_driver.logger import rootlog @@ -599,7 +599,7 @@ class Machine: return (-1, output.decode()) # Get the return code - self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) + self.shell.send(b"echo ${PIPESTATUS[0]}\n") rc = int(self._next_newline_closed_block_from_shell().strip()) return (rc, output.decode(errors="replace")) @@ -1132,7 +1132,7 @@ class Machine: return assert self.shell - self.shell.send("poweroff\n".encode()) + self.shell.send(b"poweroff\n") self.wait_for_shutdown() def crash(self) -> None: diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/test_driver/polling_condition.py index 02ca0a03ab3dc..895ac6cb72f5f 100644 --- a/nixos/lib/test-driver/test_driver/polling_condition.py +++ b/nixos/lib/test-driver/test_driver/polling_condition.py @@ -1,6 +1,6 @@ -from typing import Callable, Optional -from math import isfinite import time +from math import isfinite +from typing import Callable, Optional from .logger import rootlog diff --git a/nixos/lib/test-driver/test_driver/vlan.py b/nixos/lib/test-driver/test_driver/vlan.py index f2a7f250d1d2f..ec9679108e58d 100644 --- a/nixos/lib/test-driver/test_driver/vlan.py +++ b/nixos/lib/test-driver/test_driver/vlan.py @@ -1,8 +1,8 @@ -from pathlib import Path import io import os import pty import subprocess +from pathlib import Path from test_driver.logger import rootlog |