Merge ~sylvain-pineau/checkbox-ng:fix-1838366 into checkbox-ng:master

[Sylvain Pineau]

Patch for the linked bug

[Jonathan Cave (jocave)]

Might it be worth printing out some informational message so developers + testers know what's happening?

"<hiding binary test output>" or similar?

[Sylvain Pineau (sylvain-pineau)]

--------------[ Running job 4 / 7. Estimated time left: 0:00:02 ]---------------
--------------[ Attach FWTS desktop diagnosis log to submission ]---------------
ID: com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
Category: com.canonical.plainbox::firmware
... 8< -------------------------------------------------------------------------
(Hiding binary test output)
Outcome: job passed

review: Needs Resubmitting

[Jonathan Cave (jocave)]

Lovely, thanks :)

review: Approve

diff --git a/checkbox_ng/launcher/run.py b/checkbox_ng/launcher/run.py
index e3f10e1..3f927c1 100644
--- a/checkbox_ng/launcher/run.py
+++ b/checkbox_ng/launcher/run.py
@@ -170,12 +170,16 @@ class NormalUI(IJobRunnerUI):
             'stdout': sys.stdout,
             'stderr': sys.stderr
         }[stream_name]
-        if stream_name == 'stdout':
-            print(self.C.GREEN(line.decode("UTF-8", "ignore")),
-                  end='', file=stream)
-        elif stream_name == 'stderr':
-            print(self.C.RED(line.decode("UTF-8", "ignore")),
-                  end='', file=stream)
+        try:
+            if stream_name == 'stdout':
+                print(self.C.GREEN(line.decode("UTF-8")),
+                      end='', file=stream)
+            elif stream_name == 'stderr':
+                print(self.C.RED(line.decode("UTF-8")),
+                      end='', file=stream)
+        except UnicodeDecodeError:
+            self.show_cmd_output = False
+            print(self.C.BLACK("(" + _("Hiding binary test output") + ")"))
         stream.flush()
 
     def finished_executing_program(self, returncode):