[oe-commits] [openembedded-core] 45/66: oeqa/qemurunner: Dont mix binary and non-binary strings

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit 5685a349eb471f4c8c9dcc2dc3b34f20369920bb
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Mar 25 10:33:21 2019 +0000

    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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oeqa/utils/qemurunner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index cc95dc2..5d1d0cc 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -320,6 +320,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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.