summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLucas Bates <lucasb@mojatatu.com>2018-11-16 17:37:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-13 09:16:13 +0100
commit9806e7473d10988677c3404301dbbc00cb6d8858 (patch)
tree2cb8896b386b93c23ac9961c9c1a5da3c8db5060 /tools
parentb8c51924b4e1bc019a81aae3d6456ac26310cd38 (diff)
downloadlinux-stable-9806e7473d10988677c3404301dbbc00cb6d8858.tar.gz
linux-stable-9806e7473d10988677c3404301dbbc00cb6d8858.tar.bz2
linux-stable-9806e7473d10988677c3404301dbbc00cb6d8858.zip
tc-testing: tdc.py: ignore errors when decoding stdout/stderr
[ Upstream commit 5aaf6428526bcad98d6f51f2f679c919bb75d7e9 ] Prevent exceptions from being raised while decoding output from an executed command. There is no impact on tdc's execution and the verify command phase would fail the pattern match. Signed-off-by: Lucas Bates <lucasb@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/tc-testing/tdc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/tc-testing/tdc.py b/tools/testing/selftests/tc-testing/tdc.py
index 87a04a8a5945..9b3f414ff1e9 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -134,9 +134,9 @@ def exec_cmd(args, pm, stage, command):
(rawout, serr) = proc.communicate()
if proc.returncode != 0 and len(serr) > 0:
- foutput = serr.decode("utf-8")
+ foutput = serr.decode("utf-8", errors="ignore")
else:
- foutput = rawout.decode("utf-8")
+ foutput = rawout.decode("utf-8", errors="ignore")
proc.stdout.close()
proc.stderr.close()