]> git-server-git.apps.pok.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>
Wed, 3 Jun 2020 11:57:00 +0000 (19:57 +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 8b931517ecb2374857373513fc6a13af35335264..b030969fadc3c075f0554ea5b3af8fde144517f4 100644 (file)
@@ -100,7 +100,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):