summary refs log tree commit diff
path: root/nixos/lib/test-driver
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2021-10-19 16:29:19 +0300
committerK900 <me@0upti.me>2021-10-19 16:29:19 +0300
commit9611041ef54b09eb764ed72d95c3111ce52fe984 (patch)
treee0168e2009e3512849abeb7acb5a2b793b5186fc /nixos/lib/test-driver
parenta874235dff32bd77125034cfd9542a91b68efb03 (diff)
downloadnixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar.gz
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar.bz2
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar.lz
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar.xz
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.tar.zst
nixpkgs-9611041ef54b09eb764ed72d95c3111ce52fe984.zip
nixos/lib/test-driver: set defaults in __init__ instead of class level
Just a minor code style nit to avoid potential footguns
Diffstat (limited to 'nixos/lib/test-driver')
-rwxr-xr-xnixos/lib/test-driver/test-driver.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index f2e7bf3c1d5..3ee8b3227c6 100755
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -405,14 +405,14 @@ class Machine:
     keep_vm_state: bool
     allow_reboot: bool
 
-    process: Optional[subprocess.Popen] = None
-    pid: Optional[int] = None
-    monitor: Optional[socket.socket] = None
-    shell: Optional[socket.socket] = None
+    process: Optional[subprocess.Popen]
+    pid: Optional[int]
+    monitor: Optional[socket.socket]
+    shell: Optional[socket.socket]
     serial_thread: Optional[threading.Thread]
 
-    booted: bool = False
-    connected: bool = False
+    booted: bool
+    connected: bool
     # Store last serial console lines for use
     # of wait_for_console_text
     last_lines: Queue = Queue()
@@ -445,8 +445,15 @@ class Machine:
             self.cleanup_statedir()
         self.state_dir.mkdir(mode=0o700, exist_ok=True)
 
+        self.process = None
+        self.pid = None
+        self.monitor = None
+        self.shell = None
         self.serial_thread = None
 
+        self.booted = False
+        self.connected = False
+
     @staticmethod
     def create_startcommand(args: Dict[str, str]) -> StartCommand:
         rootlog.warning(