lol

nixos/test-driver: apply ruff fixes & suggestions

+29 -29
+5 -5
nixos/lib/test-driver/extract-docstrings.py
··· 59 59 ] 60 60 function_definitions.sort(key=lambda x: x.name) 61 61 62 - for f in function_definitions: 63 - docstr = ast.get_docstring(f) 62 + for function in function_definitions: 63 + docstr = ast.get_docstring(function) 64 64 if docstr is not None: 65 - args = ", ".join(a.arg for a in f.args.args[1:]) 65 + args = ", ".join(a.arg for a in function.args.args[1:]) 66 66 args = f"({args})" 67 67 68 - docstr = "\n".join(f" {l}" for l in docstr.strip().splitlines()) 68 + docstr = "\n".join(f" {line}" for line in docstr.strip().splitlines()) 69 69 70 - print(f"{f.name}{args}\n\n:{docstr[1:]}\n") 70 + print(f"{function.name}{args}\n\n:{docstr[1:]}\n") 71 71 72 72 73 73 if __name__ == "__main__":
+5 -6
nixos/lib/test-driver/test_driver/__init__.py
··· 1 - from pathlib import Path 2 1 import argparse 3 - import ptpython.repl 4 2 import os 5 3 import time 4 + from pathlib import Path 6 5 6 + import ptpython.repl 7 + 8 + from test_driver.driver import Driver 7 9 from test_driver.logger import rootlog 8 - from test_driver.driver import Driver 9 10 10 11 11 12 class EnvDefault(argparse.Action): ··· 25 26 ) 26 27 if required and default: 27 28 required = False 28 - super(EnvDefault, self).__init__( 29 - default=default, required=required, nargs=nargs, **kwargs 30 - ) 29 + super().__init__(default=default, required=required, nargs=nargs, **kwargs) 31 30 32 31 def __call__(self, parser, namespace, values, option_string=None): # type: ignore 33 32 setattr(namespace, self.dest, values)
+4 -4
nixos/lib/test-driver/test_driver/driver.py
··· 1 - from contextlib import contextmanager 2 - from pathlib import Path 3 - from typing import Any, Dict, Iterator, List, Union, Optional, Callable, ContextManager 4 1 import os 5 2 import re 6 3 import tempfile 4 + from contextlib import contextmanager 5 + from pathlib import Path 6 + from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union 7 7 8 8 from test_driver.logger import rootlog 9 9 from test_driver.machine import Machine, NixStartScript, retry 10 - from test_driver.vlan import VLan 11 10 from test_driver.polling_condition import PollingCondition 11 + from test_driver.vlan import VLan 12 12 13 13 14 14 def get_tmp_dir() -> Path:
+6 -5
nixos/lib/test-driver/test_driver/logger.py
··· 1 1 # mypy: disable-error-code="no-untyped-call" 2 2 # drop the above line when mypy is upgraded to include 3 3 # https://github.com/python/typeshed/commit/49b717ca52bf0781a538b04c0d76a5513f7119b8 4 - from colorama import Style, Fore 5 - from contextlib import contextmanager 6 - from typing import Any, Dict, Iterator 7 - from queue import Queue, Empty 8 - from xml.sax.saxutils import XMLGenerator 9 4 import codecs 10 5 import os 11 6 import sys 12 7 import time 13 8 import unicodedata 9 + from contextlib import contextmanager 10 + from queue import Empty, Queue 11 + from typing import Any, Dict, Iterator 12 + from xml.sax.saxutils import XMLGenerator 13 + 14 + from colorama import Fore, Style 14 15 15 16 16 17 class Logger:
+6 -6
nixos/lib/test-driver/test_driver/machine.py
··· 1 - from contextlib import _GeneratorContextManager, nullcontext 2 - from pathlib import Path 3 - from queue import Queue 4 - from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple 5 1 import base64 6 2 import io 7 3 import os ··· 16 12 import tempfile 17 13 import threading 18 14 import time 15 + from contextlib import _GeneratorContextManager, nullcontext 16 + from pathlib import Path 17 + from queue import Queue 18 + from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple 19 19 20 20 from test_driver.logger import rootlog 21 21 ··· 599 599 return (-1, output.decode()) 600 600 601 601 # Get the return code 602 - self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) 602 + self.shell.send(b"echo ${PIPESTATUS[0]}\n") 603 603 rc = int(self._next_newline_closed_block_from_shell().strip()) 604 604 605 605 return (rc, output.decode(errors="replace")) ··· 1132 1132 return 1133 1133 1134 1134 assert self.shell 1135 - self.shell.send("poweroff\n".encode()) 1135 + self.shell.send(b"poweroff\n") 1136 1136 self.wait_for_shutdown() 1137 1137 1138 1138 def crash(self) -> None:
+2 -2
nixos/lib/test-driver/test_driver/polling_condition.py
··· 1 - from typing import Callable, Optional 2 - from math import isfinite 3 1 import time 2 + from math import isfinite 3 + from typing import Callable, Optional 4 4 5 5 from .logger import rootlog 6 6
+1 -1
nixos/lib/test-driver/test_driver/vlan.py
··· 1 - from pathlib import Path 2 1 import io 3 2 import os 4 3 import pty 5 4 import subprocess 5 + from pathlib import Path 6 6 7 7 from test_driver.logger import rootlog 8 8