From: Xiubo Li <xiubli@redhat.com>
Date: Wed, 22 Apr 2020 23:39:16 +0000 (-0400)
Subject: qa/tasks/vstart_runner: fix TypeError of string argument expected, got 'bytes'
X-Git-Tag: v16.1.0~2451^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34657%2Fhead;p=ceph.git

qa/tasks/vstart_runner: fix TypeError of string argument expected, got 'bytes'

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 68745b6125f9..03bed3499222 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -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: