summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-07 18:12:15 +0100
committerSteve Sakoman <steve@sakoman.com>2021-05-14 07:16:38 -1000
commit8f24a7b35861b6aec39bc8d589e090ea9816732c (patch)
treea5f159aa99b81b6e694fa3867d0de0307403d76d /meta
parent57249316b6c66c5e17804e1b04f2d5cf0db92683 (diff)
downloadopenembedded-core-contrib-8f24a7b35861b6aec39bc8d589e090ea9816732c.tar.gz
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> (cherry picked from commit b8995b27db265b0a0b2d2ca595915f70f9f96e07) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 410789b815..09ef9fadb2 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -646,7 +646,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
@@ -659,7 +659,7 @@ class LoggingThread(threading.Thread):
# until qemu exits.
if not self.canexit:
raise Exception("Console connection closed unexpectedly")
- return ''
+ return b''
return data