]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephfs: use StringIO instead of BytesIO
authorRishabh Dave <ridave@redhat.com>
Wed, 6 May 2020 18:06:45 +0000 (23:36 +0530)
committerKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 08:34:53 +0000 (16:34 +0800)
Fixes: https://tracker.ceph.com/issues/45425
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 71b823daee05dd96cb3cced8ff34943d7afc4210)

Conflicts:
qa/tasks/cephfs/mount.py: trivial resolution

qa/tasks/cephfs/mount.py

index 77d16fb6f21bfdfa7f33f8526e4f5d73362f58e8..39c5add1363a5d828682a8d981e3218a61450506 100644 (file)
@@ -1,5 +1,4 @@
 from contextlib import contextmanager
-from io import BytesIO
 import json
 import logging
 import datetime
@@ -198,8 +197,8 @@ class CephFSMount(object):
             args = args.split()
 
         args = ["cd", self.mountpoint, run.Raw('&&'), "sudo"] + args
-        return self.client_remote.run(args=args, stdout=BytesIO(),
-                                      stderr=BytesIO(), wait=wait,
+        return self.client_remote.run(args=args, stdout=StringIO(),
+                                      stderr=StringIO(), wait=wait,
                                       stdin=stdin, check_status=check_status,
                                       omit_sudo=omit_sudo)