summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-25 10:33:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 00:31:48 +0100
commita01c029898868983962e8fa34077eb25f4017faa (patch)
treede23cec6f4e1f1e0b5f719b45e63579eefdd9314 /meta/lib
parentcba849c25b95a685eade176bf7774be16c80b14b (diff)
downloadpoky-a01c029898868983962e8fa34077eb25f4017faa.tar.gz
oeqa/qemurunner: Dont mix binary and non-binary strings
self.msg is a str(), bootlog is b'' so this code clearly doesn't work. Add in a decode since its being used as a string. (From OE-Core rev: 5685a349eb471f4c8c9dcc2dc3b34f20369920bb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index cc95dc2990..5d1d0cceca 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -320,6 +320,7 @@ class QemuRunner:
320 self.logger.debug("Target didn't reach login banner in %d seconds (%s)" % 320 self.logger.debug("Target didn't reach login banner in %d seconds (%s)" %
321 (self.boottime, time.strftime("%D %H:%M:%S"))) 321 (self.boottime, time.strftime("%D %H:%M:%S")))
322 tail = lambda l: "\n".join(l.splitlines()[-25:]) 322 tail = lambda l: "\n".join(l.splitlines()[-25:])
323 bootlog = boolog.decode("utf-8")
323 # in case bootlog is empty, use tail qemu log store at self.msg 324 # in case bootlog is empty, use tail qemu log store at self.msg
324 lines = tail(bootlog if bootlog else self.msg) 325 lines = tail(bootlog if bootlog else self.msg)
325 self.logger.debug("Last 25 lines of text:\n%s" % lines) 326 self.logger.debug("Last 25 lines of text:\n%s" % lines)