summary refs log tree commit diff
path: root/nixos/lib/test-driver/test-driver.py
diff options
context:
space:
mode:
authorJacek Galowicz <jacek.galowicz@cyberus-technology.de>2019-11-19 17:08:30 +0100
committerFlorian Klink <flokli@flokli.de>2019-11-20 17:38:20 +0100
commit72dd1c6a748890604022008c771be40322c7a5d3 (patch)
tree696726a47a0d462ac772096e0062aa856dd834b1 /nixos/lib/test-driver/test-driver.py
parent67e20428612e1376d8d62df4c98d34b6af012d10 (diff)
downloadnixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar.gz
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar.bz2
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar.lz
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar.xz
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.tar.zst
nixpkgs-72dd1c6a748890604022008c771be40322c7a5d3.zip
nixos/test: If qemu monitor returns 0, simply return (like perl script does)
Diffstat (limited to 'nixos/lib/test-driver/test-driver.py')
-rw-r--r--nixos/lib/test-driver/test-driver.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 872e96327e8..5402b937734 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -290,10 +290,15 @@ class Machine:
 
     def wait_for_monitor_prompt(self) -> str:
         assert self.monitor is not None
+        answer = ""
         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) "):
-                return answer
+                break
+        return answer
 
     def send_monitor_command(self, command: str) -> str:
         message = ("{}\n".format(command)).encode()