From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 7 May 2021 17:12:15 +0000 (+0100)
Subject: oeqa/qemurunner: Fix binary vs str issue
X-Git-Tag: uninative-3.2~197
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b8995b27db265b0a0b2d2ca595915f70f9f96e07;p=openembedded-core.git

oeqa/qemurunner: Fix binary vs str issue

The recent logging changes for qemurunner showed up as errors on the
autobuilder where decode couldn't be called on the returned string.
Since the code returns binary data, return b'' instead of '' to match
to avoid tracebacks.

One of these cases was newly added, copied from the other which has
been there for a long time, always broken.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 69fee27511..899152c7ad 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -724,7 +724,7 @@ class LoggingThread(threading.Thread):
             data = self.readsock.recv(count)
         except socket.error as e:
             if e.errno == errno.EAGAIN or e.errno == errno.EWOULDBLOCK:
-                return ''
+                return b''
             else:
                 raise
 
@@ -737,7 +737,7 @@ class LoggingThread(threading.Thread):
             # until qemu exits.
             if not self.canexit:
                 raise Exception("Console connection closed unexpectedly")
-            return ''
+            return b''
 
         return data