From 0d4d17021f9844f9b1f67b6c0278db7ebd9aa4ea Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 16 Dec 2019 02:46:13 +0100 Subject: [PATCH] qa/tasks/cephfs/kernel_mount: get rid of StringIO.StringIO for py3 Signed-off-by: Kyr Shatskyy (cherry picked from commit 875b45f3c903781ba99dbd2fcf4d2fc89001c25b) --- qa/tasks/cephfs/kernel_mount.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 66788946df521..7ef3f68f8f810 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -1,4 +1,3 @@ -from StringIO import StringIO import json import logging import time @@ -214,10 +213,10 @@ class KernelMount(CephFSMount): print(json.dumps(get_id_to_dir())) """) - p = self.client_remote.run(args=[ + output = self.client_remote.sh([ 'sudo', 'python3', '-c', pyscript - ], stdout=StringIO(), timeout=(5*60)) - client_id_to_dir = json.loads(p.stdout.getvalue()) + ], timeout=(5*60)) + client_id_to_dir = json.loads(output) try: return client_id_to_dir[self.client_id] @@ -236,10 +235,10 @@ class KernelMount(CephFSMount): print(open(os.path.join("{debug_dir}", "{filename}")).read()) """).format(debug_dir=debug_dir, filename=filename) - p = self.client_remote.run(args=[ + output = self.client_remote.sh([ 'sudo', 'python3', '-c', pyscript - ], stdout=StringIO(), timeout=(5*60)) - return p.stdout.getvalue() + ], timeout=(5*60)) + return output def get_global_id(self): """ -- 2.39.5