]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/vstart_runner: fix TypeError of string argument expected, got 'bytes' 34657/head
authorXiubo Li <xiubli@redhat.com>
Wed, 22 Apr 2020 23:39:16 +0000 (19:39 -0400)
committerXiubo Li <xiubli@redhat.com>
Tue, 28 Apr 2020 05:30:25 +0000 (01:30 -0400)
Signed-off-by: Xiubo Li <xiubli@redhat.com>
qa/tasks/vstart_runner.py

index 68745b6125f994454e9a11cad5dff736d93305ec..03bed349922248fc5370711ca9f4560e37ec06c8 100644 (file)
@@ -204,8 +204,14 @@ class LocalRemoteProcess(object):
 
         if self.subproc.poll() is not None:
             out, err = self.subproc.communicate()
-            self.stdout.write(out)
-            self.stderr.write(err)
+            if isinstance(self.stdout, StringIO):
+                self.stdout.write(out.decode(errors='ignore'))
+            else:
+                self.stdout.write(out)
+            if isinstance(self.stderr, StringIO):
+                self.stderr.write(err.decode(errors='ignore'))
+            else:
+                self.stderr.write(err)
             self.exitstatus = self.returncode = self.subproc.returncode
             return True
         else: