]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/util/rgw: get rid of cString for py3
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Sat, 15 Feb 2020 11:05:44 +0000 (12:05 +0100)
committerKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 08:34:53 +0000 (16:34 +0800)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit 683421ea24bbed4ba72ea96a9055134bed554696)

qa/tasks/util/rgw.py

index 91652198b8a6f57dc047b503aaf4d859858283c0..06ab47b5a98d4c361ad303d26cebcd38dba77e2b 100644 (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: