Merge pull request #96 from bridadan/fix_test_encode_failure

Fix test encode failure

Author: theotherjimmy

src/mbed_os_tools/test/mbed_test_api.py

@@ -125,7 +125,7 @@ def run_htrun(cmd, verbose):
     htrun_failure_line = re.compile('\[RXD\] (:\d+::FAIL: .*)')
 
     for line in iter(p.stdout.readline, b''):
-        decoded_line = line.decode('utf-8', 'ignore')
+        decoded_line = line.decode("utf-8", "replace")
         htrun_output += decoded_line
         # When dumping output to file both \r and \n will be a new line
         # To avoid this "extra new-line" we only use \n at the end
@@ -135,7 +135,20 @@ def run_htrun(cmd, verbose):
             gt_logger.gt_log_err(test_error.group(1))
 
         if verbose:
-            sys.stdout.write(decoded_line.rstrip() + '\n')
+            output = decoded_line.rstrip() + '\n'
+            try:
+                # Try to output decoded unicode. Should be fine in most Python 3
+                # environments.
+                sys.stdout.write(output)
+            except UnicodeEncodeError:
+                try:
+                    # Try to encode to unicode bytes and let the terminal handle
+                    # the decoding. Some Python 2 and OS combinations handle this
+                    # gracefully.
+                    sys.stdout.write(output.encode("utf-8"))
+                except TypeError:
+                    # Fallback to printing just ascii characters
+                    sys.stdout.write(output.encode("ascii", "replace").decode("ascii"))
             sys.stdout.flush()
 
     # Check if process was terminated by signal

test/test/mbed_gt_test_api.py

@@ -15,7 +15,7 @@
 
 import unittest
 from mbed_os_tools.test import mbed_test_api
-
+from mock import patch, MagicMock
 
 
 class GreenteaTestAPI(unittest.TestCase):
@@ -589,5 +589,15 @@ def test_get_testcase_result_start_tag_missing(self):
         result = mbed_test_api.get_testcase_result(self.OUTPUT_STARTTAG_MISSING)
         self.assertEqual(result['DNS query']['utest_log'], "__testcase_start tag not found.")
 
+    def test_run_htrun_unicode(self):
+        with patch("mbed_os_tools.test.mbed_test_api.run_command") as _run_command:
+            read_line_mock = MagicMock()
+            read_line_mock.decode = MagicMock(return_value=u"\u036b")
+            p_mock = MagicMock()
+            p_mock.wait = MagicMock(return_value=1337)
+            p_mock.stdout.readline = MagicMock(side_effect=[read_line_mock])
+            _run_command.return_value = p_mock
+            returncode, htrun_output = mbed_test_api.run_htrun("dummy", True)
+
 if __name__ == '__main__':
     unittest.main()