From 7202d8a72c749a152a648dcbbcd86387dc988672 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 6 Apr 2020 15:03:22 +0800 Subject: [PATCH] test/rgw/rgw_multi: do not decode a str `s` comes from `rgwadmin()`, which passes `StringIO` as stdout, so the the output should an instance of `str` in both Python2 and Python3. hence there is no need to decode it using UTF-8 codecs again. Signed-off-by: Kefu Chai --- src/test/rgw/rgw_multi/multisite.py | 3 +-- src/test/rgw/rgw_multi/tests.py | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index a0a53fe4d5f0e..a79c42909b16f 100644 --- a/src/test/rgw/rgw_multi/multisite.py +++ b/src/test/rgw/rgw_multi/multisite.py @@ -72,8 +72,7 @@ class SystemObject: data and retcode """ s, r = self.command(cluster, cmd, args or [], **kwargs) if r == 0: - output = s.decode('utf-8') - output = output[output.find('{'):] # trim extra output before json + output = s[s.find('{'):] # trim extra output before json data = json.loads(output) self.load_from_json(data) self.data = data diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index d7b5f84ed9963..f910b7c57e4a1 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -78,7 +78,6 @@ def mdlog_list(zone, period = None): if period: cmd += ['--period', period] (mdlog_json, _) = zone.cluster.admin(cmd, read_only=True) - mdlog_json = mdlog_json.decode('utf-8') return json.loads(mdlog_json) def mdlog_autotrim(zone): @@ -87,7 +86,6 @@ def mdlog_autotrim(zone): def datalog_list(zone, period = None): cmd = ['datalog', 'list'] (datalog_json, _) = zone.cluster.admin(cmd, read_only=True) - datalog_json = datalog_json.decode('utf-8') return json.loads(datalog_json) def datalog_autotrim(zone): @@ -97,14 +95,12 @@ def bilog_list(zone, bucket, args = None): cmd = ['bilog', 'list', '--bucket', bucket] + (args or []) cmd += ['--tenant', config.tenant, '--uid', user.name] if config.tenant else [] bilog, _ = zone.cluster.admin(cmd, read_only=True) - bilog = bilog.decode('utf-8') return json.loads(bilog) def bilog_autotrim(zone, args = None): zone.cluster.admin(['bilog', 'autotrim'] + (args or [])) def parse_meta_sync_status(meta_sync_status_json): - meta_sync_status_json = meta_sync_status_json.decode('utf-8') log.debug('current meta sync status=%s', meta_sync_status_json) sync_status = json.loads(meta_sync_status_json) @@ -142,7 +138,7 @@ def meta_sync_status(zone): def meta_master_log_status(master_zone): cmd = ['mdlog', 'status'] + master_zone.zone_args() mdlog_status_json, retcode = master_zone.cluster.admin(cmd, read_only=True) - mdlog_status = json.loads(mdlog_status_json.decode('utf-8')) + mdlog_status = json.loads(mdlog_status_json) markers = {i: s['marker'] for i, s in enumerate(mdlog_status)} log.debug('master meta markers=%s', markers) @@ -212,7 +208,6 @@ def realm_meta_checkpoint(realm): zonegroup_meta_checkpoint(zonegroup, meta_master_zone, master_status) def parse_data_sync_status(data_sync_status_json): - data_sync_status_json = data_sync_status_json.decode('utf-8') log.debug('current data sync status=%s', data_sync_status_json) sync_status = json.loads(data_sync_status_json) @@ -261,7 +256,6 @@ def bucket_sync_status(target_zone, source_zone, bucket_name): assert(retcode == 2) # ENOENT - bucket_sync_status_json = bucket_sync_status_json.decode('utf-8') sync_status = json.loads(bucket_sync_status_json) markers={} @@ -276,7 +270,7 @@ def data_source_log_status(source_zone): source_cluster = source_zone.cluster cmd = ['datalog', 'status'] + source_zone.zone_args() datalog_status_json, retcode = source_cluster.admin(cmd, read_only=True) - datalog_status = json.loads(datalog_status_json.decode('utf-8')) + datalog_status = json.loads(datalog_status_json) markers = {i: s['marker'] for i, s in enumerate(datalog_status)} log.debug('data markers for zone=%s markers=%s', source_zone.name, markers) @@ -288,7 +282,7 @@ def bucket_source_log_status(source_zone, bucket_name): cmd += ['--tenant', config.tenant, '--uid', user.name] if config.tenant else [] source_cluster = source_zone.cluster bilog_status_json, retcode = source_cluster.admin(cmd, read_only=True) - bilog_status = json.loads(bilog_status_json.decode('utf-8')) + bilog_status = json.loads(bilog_status_json) m={} markers={} -- 2.39.5