From 5ebc470dfa0cc18556582db075097b6270963f13 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 28 Mar 2020 19:10:03 +0800 Subject: [PATCH] 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 (cherry picked from commit f10f86579684a0d1b8d99787b8e19709a64df7d6) --- qa/tasks/cephfs/mount.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 39c5add1363a5..421d0c5c73b44 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -4,6 +4,7 @@ import logging import datetime import six import time +from six import StringIO from textwrap import dedent import os from teuthology.orchestra import run @@ -184,7 +185,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='python3'): p = self._run_python(pyscript, py_version) -- 2.39.5