Set utf-8 in decode and encode calls

It eases backporting in iruya and hunter as a few logs can't be
decoded as ascii [1].

[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-vnf-iruya-juju_epc-run/56/console

Change-Id: I09c793469bdf4a679e6ed5a268e705efa5f2a20f
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>

diff --git a/xtesting/core/feature.py b/xtesting/core/feature.py
index 6d5d741..f28e720 100644 (file)
--- a/xtesting/core/feature.py
+++ b/xtesting/core/feature.py
@@ -113,8 +113,8 @@ class BashFeature(Feature):
                     stderr=subprocess.STDOUT)
                 for line in iter(process.stdout.readline, b''):
                     if console:
-                        sys.stdout.write(line.decode())
-                    f_stdout.write(line.decode())
+                        sys.stdout.write(line.decode("utf-8"))
+                    f_stdout.write(line.decode("utf-8"))
                 process.wait()
             with open(self.result_file, 'r') as f_stdin:
                 self.__logger.debug("$ %s\n%s", cmd, f_stdin.read().rstrip())

diff --git a/xtesting/core/unit.py b/xtesting/core/unit.py
index 8e603ce..774411a 100644 (file)
--- a/xtesting/core/unit.py
+++ b/xtesting/core/unit.py
@@ -48,7 +48,7 @@ class Suite(testcase.TestCase):
         stats = subprocess.Popen(
             ['subunit-stats'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         output, _ = stats.communicate(stream.read())
-        cls.__logger.info("\n\n%s", output.decode())
+        cls.__logger.info("\n\n%s", output.decode("utf-8"))
 
     def generate_xunit(self, stream):
         """Generate junit report from subunit stream
@@ -62,7 +62,7 @@ class Suite(testcase.TestCase):
                 ['subunit2junitxml'], stdin=subprocess.PIPE,
                 stdout=subprocess.PIPE)
             output, _ = stats.communicate(stream.read())
-            xml.write(output.decode())
+            xml.write(output.decode("utf-8"))
 
     def generate_html(self, stream):
         """Generate html report from subunit stream