colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/test-driver: remove allow_reboot state from Machine, make it a start() kwarg

Browse Source
This commit is contained in:
Astro 2023-03-16 01:50:15 +01:00
parent f4331c4983
commit 64a4ae6f37
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/lib/test-driver/test_driver/driver.py
View File

@ -179,7 +179,6 @@ class Driver:
start_command=cmd, start_command=cmd,
name=name, name=name,
keep_vm_state=args.get("keep_vm_state", False), keep_vm_state=args.get("keep_vm_state", False),
allow_reboot=args.get("allow_reboot", False),
) )
def serial_stdout_on(self) -> None: def serial_stdout_on(self) -> None:

9
nixos/lib/test-driver/test_driver/machine.py
View File

@ -311,7 +311,6 @@ class Machine:
start_command: StartCommand start_command: StartCommand
keep_vm_state: bool keep_vm_state: bool
allow_reboot: bool
process: Optional[subprocess.Popen] process: Optional[subprocess.Popen]
pid: Optional[int] pid: Optional[int]
@ -336,13 +335,11 @@ class Machine:
start_command: StartCommand, start_command: StartCommand,
name: str = "machine", name: str = "machine",
keep_vm_state: bool = False, keep_vm_state: bool = False,
allow_reboot: bool = False,
callbacks: Optional[List[Callable]] = None, callbacks: Optional[List[Callable]] = None,
) -> None: ) -> None:
self.out_dir = out_dir self.out_dir = out_dir
self.tmp_dir = tmp_dir self.tmp_dir = tmp_dir
self.keep_vm_state = keep_vm_state self.keep_vm_state = keep_vm_state
self.allow_reboot = allow_reboot
self.name = name self.name = name
self.start_command = start_command self.start_command = start_command
self.callbacks = callbacks if callbacks is not None else [] self.callbacks = callbacks if callbacks is not None else []
@ -873,7 +870,7 @@ class Machine:
self.process.stdin.write(chars.encode()) self.process.stdin.write(chars.encode())
self.process.stdin.flush() self.process.stdin.flush()
def start(self) -> None: def start(self, allow_reboot: bool = False) -> None:
if self.booted: if self.booted:
return return
@ -897,7 +894,7 @@ class Machine:
self.shared_dir, self.shared_dir,
self.monitor_path, self.monitor_path,
self.shell_path, self.shell_path,
self.allow_reboot, allow_reboot,
) )
self.monitor, _ = monitor_socket.accept() self.monitor, _ = monitor_socket.accept()
self.shell, _ = shell_socket.accept() self.shell, _ = shell_socket.accept()
@ -950,7 +947,7 @@ class Machine:
"""Press Ctrl+Alt+Delete in the guest. """Press Ctrl+Alt+Delete in the guest.
Prepares the machine to be reconnected which is useful if the Prepares the machine to be reconnected which is useful if the
machine was started after setting `machine.allow_reboot = True` machine was started with `allow_reboot = True`
""" """
self.send_key(f"ctrl-alt-delete") self.send_key(f"ctrl-alt-delete")
self.connected = False self.connected = False

2
nixos/tests/login.nix
View File

@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
}; };
testScript = '' testScript = ''
machine.allow_reboot = True machine.start(allow_reboot = True)
machine.wait_for_unit("multi-user.target") machine.wait_for_unit("multi-user.target")
machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")