]> git.apps.os.sepia.ceph.com Git - ceph.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>
Sun, 14 Jun 2020 08:34:52 +0000 (16:34 +0800)
so its consumer can feed the returned str to json.loads()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 23ddf03d26c2c8550b8c9a0c5334fe7b8f4e1682)

src/test/rgw/rgw_multi/zone_ps.py

index 9e3bdd9587b0bb8e8da9cd03948d40a3b3f88634..3f40dce8acebeb7d37030eb89136d6a18e1b779f 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):