diff options
| author | Pierre Equoy <pierre.equoy@canonical.com> | 2016-07-13 09:51:08 +0000 |
|---|---|---|
| committer | Sylvain Pineau <> | 2016-07-13 09:51:08 +0000 |
| commit | fe777a86c6118769321c24d7b98a7a951ed46c6f (patch) | |
| tree | 7006f0f7bd2593a716efd9dac4ea742dd53a02ff | |
| parent | 251fdb52a5ff2545bd3ed5fdc7af2413453d5267 (diff) | |
| parent | fbc0a32436284f87c9e3b78d332e470eb019d2aa (diff) | |
"automatic merge of lp:~pierre-equoy/checkbox/fix-1602070/ by tarmac [r=sylvain-pineau][bug=1602070][author=pierre-equoy]"
| -rwxr-xr-x | bin/pm_test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/pm_test b/bin/pm_test index 558c464..1449604 100755 --- a/bin/pm_test +++ b/bin/pm_test @@ -324,11 +324,11 @@ class Command(object): '- returncode:\n{0}'.format(self.process.returncode)] if stdout: if type(stdout) is bytes: - stdout = stdout.decode('utf-8') + stdout = stdout.decode('utf-8', 'ignore') message.append('- stdout:\n{0}'.format(stdout)) if stderr: if type(stderr) is bytes: - stderr = stderr.decode('utf-8') + stderr = stderr.decode('utf-8', 'ignore') message.append('- stderr:\n{0}'.format(stderr)) logging.debug('\n'.join(message)) |
