From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 Mar 2020 11:10:03 +0000 (+0800)
Subject: qa/tasks/cephfs: use StringIO for capturing str
X-Git-Tag: v14.2.10~17^2~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3871da1792bd610f782655651596c4ed3441b86;p=ceph.git

qa/tasks/cephfs: use StringIO for capturing str

if we don't expect non-utf8 in stdout, use StringIO instead of BytesIO.

see also d8d44ed1566b19eec055e07da2a0fed88fed4152

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f10f86579684a0d1b8d99787b8e19709a64df7d6)

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

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 339e0280162..7bd6278f81b 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -5,6 +5,7 @@ import logging
 import datetime
 import six
 import time
+from six import StringIO
 from textwrap import dedent
 import os
 from teuthology.orchestra import run
@@ -149,7 +150,7 @@ class CephFSMount(object):
         return self.client_remote.run(
                args=['sudo', 'adjust-ulimits', 'daemon-helper', 'kill',
                      py_version, '-c', pyscript], wait=False, stdin=run.PIPE,
-               stdout=BytesIO())
+               stdout=StringIO())
 
     def run_python(self, pyscript, py_version='python'):
         p = self._run_python(pyscript, py_version)
@@ -158,8 +159,8 @@ class CephFSMount(object):
 
     def run_shell(self, args, wait=True, check_status=True, omit_sudo=True):
         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,
                                       check_status=check_status,
                                       omit_sudo=omit_sudo)