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

nixos/test: If qemu monitor returns 0, simply return (like perl script does)

This commit is contained in:
Jacek Galowicz 2019-11-19 17:08:30 +01:00 committed by Florian Klink
parent 67e2042861
commit 72dd1c6a74
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,10 +290,15 @@ class Machine:
def wait_for_monitor_prompt(self) -> str: def wait_for_monitor_prompt(self) -> str:
assert self.monitor is not None assert self.monitor is not None
answer = ""
while True: while True:
answer = self.monitor.recv(1024).decode() undecoded_answer = self.monitor.recv(1024)
if not undecoded_answer:
break
answer += undecoded_answer.decode()
if answer.endswith("(qemu) "): if answer.endswith("(qemu) "):
return answer break
return answer
def send_monitor_command(self, command: str) -> str: def send_monitor_command(self, command: str) -> str:
message = ("{}\n".format(command)).encode() message = ("{}\n".format(command)).encode()