summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 19:49:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-13 20:50:00 +0100
commitb3bae8aba5b897c1afcc8bf4ad8929251812d2b5 (patch)
treeaa7bb186207d0c381193ae84ea5440e99743b9f5
parent1b9a2374be8723de654afa2c59a8b10266e5d8df (diff)
downloadopenembedded-core-contrib-b3bae8aba5b897c1afcc8bf4ad8929251812d2b5.tar.gz
openembedded-core-contrib-b3bae8aba5b897c1afcc8bf4ad8929251812d2b5.tar.bz2
openembedded-core-contrib-b3bae8aba5b897c1afcc8bf4ad8929251812d2b5.zip
oeqa/target/ssh: Replace suggogatepass with ignoring errors
We continued to see encoding problems with ssh commands run in oeqa. After much research the conclusion was we should use ignore the errors since some occasional bad locale encoding is better than the unicode decoding issues we were seeing which crashed large parts of tests. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/core/target/ssh.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index cf3d44d12d..51032ef1a9 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -210,7 +210,7 @@ def SSHCall(command, logger, timeout=None, **opts):
logger.debug('time: %s, endtime: %s' % (time.time(), endtime))
try:
if select.select([process.stdout], [], [], 5)[0] != []:
- reader = codecs.getreader('utf-8')(process.stdout, 'surrogatepass')
+ reader = codecs.getreader('utf-8')(process.stdout, 'ignore')
data = reader.read(1024, 4096)
if not data:
process.stdout.close()
@@ -237,7 +237,7 @@ def SSHCall(command, logger, timeout=None, **opts):
output += lastline
else:
- output = process.communicate()[0].decode("utf-8", errors='surrogatepass')
+ output = process.communicate()[0].decode('utf-8', errors='ignore')
logger.debug('Data from SSH call: %s' % output.rstrip())
options = {