]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/qemurunner: Dont mix binary and non-binary strings
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 25 Mar 2019 10:33:21 +0000 (10:33 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 25 Mar 2019 11:56:56 +0000 (11:56 +0000)
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/qemurunner.py

index 7ef506b60a2c922c2fddaf82ea7404083e67387e..49020c1e636d1560cd698f17c5acd0d230b0044a 100644 (file)
@@ -329,6 +329,7 @@ class QemuRunner:
                 self.logger.debug("Target didn't reach login banner in %d seconds (%s)" %
                                   (self.boottime, time.strftime("%D %H:%M:%S")))
             tail = lambda l: "\n".join(l.splitlines()[-25:])
+            bootlog = boolog.decode("utf-8")
             # in case bootlog is empty, use tail qemu log store at self.msg
             lines = tail(bootlog if bootlog else self.msg)
             self.logger.debug("Last 25 lines of text:\n%s" % lines)