nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-11-04 11:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/test-driver: also add machine name to the other errors

Browse Source
This commit is contained in:
K900
2026-10-23 11:41:27 +03:00
committed by Maximilian Bosch
parent e5d47c704e
commit fa391feabe
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/lib/test-driver/src/test_driver/machine/__init__.py
View File

@@ -742,7 +742,7 @@ class BaseMachine(ABC):
)
if ret.returncode != 0:
raise MachineError(
f"Cannot convert screenshot (pnmtopng returned code {ret.returncode})"
f"{self.name}: Cannot convert screenshot (pnmtopng returned code {ret.returncode})"
)
def get_screen_text_variants(self) -> list[str]:
@@ -1802,7 +1802,7 @@ class NspawnMachine(BaseMachine):
ret = subprocess.run(["xwdtopnm", xwd_path], stdout=ppm)
if ret.returncode != 0:
raise MachineError(
f"Cannot convert screenshot (xwdtopnm returned code {ret.returncode})"
f"{self.name}: Cannot convert screenshot (xwdtopnm returned code {ret.returncode})"
)
yield ppm_path
@@ -1901,7 +1901,9 @@ class NspawnMachine(BaseMachine):
# Poll the socket until we have the container leader PID
while True:
if self.process.poll() is not None:
raise MachineError("systemd-nspawn process exited unexpectedly")
raise MachineError(
f"{self.name}: systemd-nspawn process exited unexpectedly"
)
with self._notify_lock:
is_ready = self._notify_ready