]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
test/rgw/rgw_multi: return (str, int) from make_request()
authorKefu Chai <kchai@redhat.com>
Tue, 7 Apr 2020 13:22:36 +0000 (21:22 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 7 Apr 2020 13:51:23 +0000 (21:51 +0800)
so its consumer can feed the returned str to json.loads()

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/test/rgw/rgw_multi/zone_ps.py

index d6b93771e604a30ae887228601686e9cb96c2cee..84413f5565d8ff6211c1e2784936f8ad58080877 100644 (file)
@@ -96,7 +96,7 @@ def make_request(conn, method, resource, parameters=None, sign_parameters=False,
     data = response.read()
     status = response.status
     http_conn.close()
-    return data, status
+    return data.decode('utf-8'), status
 
 
 def print_connection_info(conn):