diff mbox series

[PULL,2/8] tests/vm: add console_consume helper

Message ID 20191112145028.26386-3-alex.bennee@linaro.org
State Accepted
Commit 6c4f0416be5805962a77af240a41fae5eaffda8b
Headers show
Series testing and tcg plugin api ver | expand

Commit Message

Alex Bennée Nov. 12, 2019, 2:50 p.m. UTC 
From: Gerd Hoffmann <kraxel@redhat.com>


Helper function to read all console output.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Message-Id: <20191031085306.28888-3-kraxel@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>


-- 
2.20.1
diff mbox series

Patch

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 2929de23aa7..086bfb2c66d 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -242,6 +242,25 @@  class BaseVM(object):
             return False
         return True
 
+    def console_consume(self):
+        vm = self._guest
+        output = ""
+        vm.console_socket.setblocking(0)
+        while True:
+            try:
+                chars = vm.console_socket.recv(1)
+            except:
+                break
+            output += chars.decode("latin1")
+            if "\r" in output or "\n" in output:
+                lines = re.split("[\r\n]", output)
+                output = lines.pop()
+                if self.debug:
+                    self.console_log("\n".join(lines))
+        if self.debug:
+            self.console_log(output)
+        vm.console_socket.setblocking(1)
+
     def console_send(self, command):
         vm = self._guest
         if self.debug: