summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/qemurunner.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 7ca9f1c736..360aa3fc37 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -274,7 +274,7 @@ class QemuRunner:
274 reachedlogin = False 274 reachedlogin = False
275 stopread = False 275 stopread = False
276 qemusock = None 276 qemusock = None
277 bootlog = '' 277 bootlog = b''
278 data = b'' 278 data = b''
279 while time.time() < endtime and not stopread: 279 while time.time() < endtime and not stopread:
280 try: 280 try:
@@ -291,17 +291,13 @@ class QemuRunner:
291 else: 291 else:
292 data = data + sock.recv(1024) 292 data = data + sock.recv(1024)
293 if data: 293 if data:
294 try: 294 bootlog += data
295 data = data.decode("utf-8", errors="surrogateescape") 295 data = b''
296 bootlog += data 296 if b' login:' in bootlog:
297 data = b'' 297 self.server_socket = qemusock
298 if re.search(".* login:", bootlog): 298 stopread = True
299 self.server_socket = qemusock 299 reachedlogin = True
300 stopread = True 300 self.logger.debug("Reached login banner")
301 reachedlogin = True
302 self.logger.debug("Reached login banner")
303 except UnicodeDecodeError:
304 continue
305 else: 301 else:
306 socklist.remove(sock) 302 socklist.remove(sock)
307 sock.close() 303 sock.close()