mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 12:32:15 +02:00
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. (From OE-Core rev: 000feb98ff99e74d6118fc3f53330b8e975923d9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b8995b27db265b0a0b2d2ca595915f70f9f96e07) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -650,7 +650,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
|
||||
|
||||
@@ -663,7 +663,7 @@ class LoggingThread(threading.Thread):
|
||||
# until qemu exits.
|
||||
if not self.canexit:
|
||||
raise Exception("Console connection closed unexpectedly")
|
||||
return ''
|
||||
return b''
|
||||
|
||||
return data
|
||||
|
||||
|
||||
Reference in New Issue
Block a user