From 0e1d359e467f40cc90f25d12dbff09df7f1520d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 28 Jan 2026 15:31:50 +0100 Subject: [PATCH] nixos/test-driver: add machine name to all log output --- nixos/lib/test-driver/src/test_driver/machine/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py index a78ebb721986..373b0f4d5a1d 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py @@ -581,10 +581,8 @@ class BaseMachine(ABC): def cleanup_statedir(self) -> None: shutil.rmtree(self.state_dir) - self.logger.log(f"deleting machine state directory {self.state_dir}") - self.logger.log( - "if you want to keep the machine state, pass --keep-machine-state" - ) + self.log(f"deleting machine state directory {self.state_dir}") + self.log("if you want to keep the machine state, pass --keep-machine-state") def copy_from_machine(self, source: str, target_dir: str = "") -> None: """Copy a file from the machine (specified by an in-machine source path) to a path @@ -1443,7 +1441,7 @@ class NspawnMachine(BaseMachine): systemd_nspawn_pid = None for line_bytes in self.process.stdout: line = line_bytes.decode() - print(line, end="") + self.log(line.rstrip()) systemd_nspawn_pid_prefix = "systemd-nspawn's PID is " if line.startswith(systemd_nspawn_pid_prefix):