RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-10 02:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/util/rgw: get rid of cString for py3

Browse Source 
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
This commit is contained in:
Kyr Shatskyy 2020-02-15 12:05:44 +01:00
parent 4cf205f285
commit 683421ea24
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/tasks/util/rgw.py
View File

@ -1,4 +1,4 @@
from cStringIO import StringIO
from io import BytesIO
import logging
import json
import time
@ -7,7 +7,7 @@ from teuthology import misc as teuthology
log = logging.getLogger(__name__)
def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False,
def rgwadmin(ctx, client, cmd, stdin=BytesIO(), check_status=False,
format='json', decode=True, log_level=logging.DEBUG):
log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd))
testdir = teuthology.get_testdir(ctx)
@ -29,8 +29,8 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False,
proc = remote.run(
args=pre,
check_status=check_status,
stdout=StringIO(),
stderr=StringIO(),
stdout=BytesIO(),
stderr=BytesIO(),
stdin=stdin,
)
r = proc.exitstatus
@ -81,9 +81,9 @@ def wait_for_radosgw(url, remote):
proc = remote.run(
args=curl_cmd,
check_status=False,
stdout=StringIO(),
stderr=StringIO(),
stdin=StringIO(),
stdout=BytesIO(),
stderr=BytesIO(),
stdin=BytesIO(),
)
exit_status = proc.exitstatus
if exit_status == 0: