]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/tasks/cephfs: switch to StringIO to fix byte-like errors
authorXiubo Li <xiubli@redhat.com>
Thu, 23 Apr 2020 11:21:46 +0000 (07:21 -0400)
committerXiubo Li <xiubli@redhat.com>
Sat, 25 Apr 2020 10:21:55 +0000 (06:21 -0400)
Signed-off-by: Xiubo Li <xiubli@redhat.com>
qa/tasks/cephfs/filesystem.py
qa/tasks/vstart_runner.py

index 60877ed63a4f5fd5202b0fdd7599593d307cdaca..2847b57da77608e8ffac7f95394314e20951833f 100644 (file)
@@ -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
index 6e4403c6ef5b747175eb5a58d8bcb08d3bc1d526..9e1c0def57cc86e9f5446a97c8e13c663a0faadb 100644 (file)
@@ -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):