From a9d7f098f9cee38aa06967e31afea10006986fb6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Nov 2017 11:42:54 +0000 Subject: qemurunner: Simplify binary data handling I have concerns that bad timing of the flow of data from the logger might corrupt the output due to the way binary strings are handled in qemurunner. This simplifies the code to do the same thing it did before but much more safely. (From OE-Core rev: 1e87283e92a2765bb5d54d17138b208bc395953b) Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'meta/lib/oeqa/utils') diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 82335d8456..0631d43218 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -275,7 +275,7 @@ class QemuRunner: reachedlogin = False stopread = False qemusock = None - bootlog = '' + bootlog = b'' data = b'' while time.time() < endtime and not stopread: try: @@ -292,17 +292,13 @@ class QemuRunner: else: data = data + sock.recv(1024) if data: - try: - data = data.decode("utf-8", errors="surrogateescape") - bootlog += data - data = b'' - if re.search(".* login:", bootlog): - self.server_socket = qemusock - stopread = True - reachedlogin = True - self.logger.debug("Reached login banner") - except UnicodeDecodeError: - continue + bootlog += data + data = b'' + if b' login:' in bootlog: + self.server_socket = qemusock + stopread = True + reachedlogin = True + self.logger.debug("Reached login banner") else: socklist.remove(sock) sock.close() -- cgit v1.2.3-54-g00ecf