Merge "Ensure to decode bytes or fail"

neutronclient/tests/unit/test_cli20.py

@@ -73,13 +73,7 @@ class FakeStdout(object):
     def make_string(self):
         result = ''
         for line in self.content:
-            if six.PY3:
+            result += encodeutils.safe_decode(line, 'utf-8')
-                if isinstance(line, bytes):
-                    try:
-                        line = line.decode(encoding='utf-8')
-                    except UnicodeError:
-                        pass
-            result = result + line
         return result