summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 13:27:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:02 +0100
commit440c6816465c42dcf133d4bb48dcfbb9b5ad534b (patch)
treea1508beea98214a8a50bfbb48e566db31bcaf393 /meta/lib/oeqa
parent76aefc4c1554e505bff4603244e2f95c9c66989d (diff)
downloadpoky-440c6816465c42dcf133d4bb48dcfbb9b5ad534b.tar.gz
qemurunner: Use surrogateescape decoding
Since the stream can contain invalid binary characters (e.g. from ppc's bootloader) use surrogateescape decoding to ensure we do process the character stream, else it can hang/timeout. (From OE-Core rev: 28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index e408fbbf3a..b8ac3f0bb6 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -234,7 +234,7 @@ class QemuRunner:
234 data = data + sock.recv(1024) 234 data = data + sock.recv(1024)
235 if data: 235 if data:
236 try: 236 try:
237 data = data.decode("utf-8") 237 data = data.decode("utf-8", errors="surrogateescape")
238 bootlog += data 238 bootlog += data
239 data = b'' 239 data = b''
240 if re.search(".* login:", bootlog): 240 if re.search(".* login:", bootlog):