From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 23 Apr 2020 11:21:46 +0000 (-0400)
Subject: qa/tasks/cephfs: switch to StringIO to fix byte-like errors
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1439^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dd4fc808a8a26ebbfae5b5e4bc3b6c99bf0f5d37;p=ceph-ci.git

qa/tasks/cephfs: switch to StringIO to fix byte-like errors

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

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 60877ed63a4..2847b57da77 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -1349,7 +1349,7 @@ class Filesystem(MDSCluster):
             base_args.extend(["--rank", "%s" % str(rank)])
 
         t1 = datetime.datetime.now()
-        r = self.tool_remote.sh(base_args + args).strip()
+        r = self.tool_remote.sh(script=base_args + args, stdout=StringIO()).strip()
         duration = datetime.datetime.now() - t1
         log.info("Ran {0} in time {1}, result:\n{2}".format(
             base_args + args, duration, r
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 6e4403c6ef5..9e1c0def57c 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -940,7 +940,7 @@ class LocalCephManager(CephManager):
         if watch_channel is not None:
             args.append("--watch-channel")
             args.append(watch_channel)
-        proc = self.controller.run(args=args, wait=False, stdout=BytesIO())
+        proc = self.controller.run(args=args, wait=False, stdout=StringIO())
         return proc
 
     def raw_cluster_cmd(self, *args, **kwargs):