summaryrefslogtreecommitdiff
diff options
authorPierre Equoy <pierre.equoy@canonical.com>2016-07-18 12:25:45 +0800
committerPierre Equoy <pierre.equoy@canonical.com>2016-07-18 12:25:45 +0800
commit0822ba3091542c54693365bcf0491e608edbf628 (patch)
treebe3c73931d4c5689723824161bbf635ddc485ed4
parentf480b93ea317a4d72f43ea830a42a28e240f7f18 (diff)
provider:checkbox: Fix UnicodeDecodeError in fwts_test scriptplainbox-provider-checkbox-v0.29c2plainbox-provider-checkbox-v0.29
-rwxr-xr-xbin/fwts_test4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/fwts_test b/bin/fwts_test
index 9b0f616..cb0924b 100755
--- a/bin/fwts_test
+++ b/bin/fwts_test
@@ -413,10 +413,10 @@ def main():
# generated by FWTS.
with open(args.log, 'a') as logfile:
logfile.write("--- beginning of dmesg ---\n")
- logfile.write(check_output('dmesg', universal_newlines=True))
+ logfile.write(check_output('dmesg').decode('utf-8', 'ignore'))
logfile.write("--- end of dmesg ---\n")
logfile.write("--- beginning of syslog ---\n")
- logfile.write(check_output(['cat', '/var/log/syslog'], universal_newlines=True))
+ logfile.write(check_output(['cat', '/var/log/syslog']).decode('utf-8', 'ignore'))
logfile.write("--- end of syslog ---\n")
# parse the summaries