From 253fc931800a0fac8f86c9228f58ba096f58dfeb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 5 Apr 2020 00:20:42 +0800 Subject: [PATCH] test/rgw: use "a // b" instead of "a / b" for expressions where the value is expected to be integer. as in python3, `a / b` returns a float. Signed-off-by: Kefu Chai --- src/test/rgw/rgw_multi/tests_es.py | 6 +++--- src/test/rgw/rgw_multi/zone_cloud.py | 2 +- src/test/rgw/rgw_multi/zone_es.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/rgw/rgw_multi/tests_es.py b/src/test/rgw/rgw_multi/tests_es.py index d000c2d41e55a..1854c4cfedb02 100644 --- a/src/test/rgw/rgw_multi/tests_es.py +++ b/src/test/rgw/rgw_multi/tests_es.py @@ -227,16 +227,16 @@ def test_es_object_search_custom(): do_check_mdsearch(target_conn.conn, bucket, src_keys , 'x-amz-meta-foo-date > ' + sval, lambda k: date_from_str(k.get_metadata('foo-date')) > val) # 'or' query - for i in range(len(src_keys) / 2): + for i in range(len(src_keys) // 2): do_check_mdsearch(target_conn.conn, bucket, src_keys , 'x-amz-meta-foo-str <= ' + str_vals[i] + ' or x-amz-meta-foo-str >= ' + str_vals[-i], lambda k: k.get_metadata('foo-str') <= str_vals[i] or k.get_metadata('foo-str') >= str_vals[-i] ) # 'and' query - for i in range(len(src_keys) / 2): + for i in range(len(src_keys) // 2): do_check_mdsearch(target_conn.conn, bucket, src_keys , 'x-amz-meta-foo-str >= ' + str_vals[i] + ' and x-amz-meta-foo-str <= ' + str_vals[i + 1], lambda k: k.get_metadata('foo-str') >= str_vals[i] and k.get_metadata('foo-str') <= str_vals[i + 1] ) # more complicated query - for i in range(len(src_keys) / 2): + for i in range(len(src_keys) // 2): do_check_mdsearch(target_conn.conn, None, src_keys , 'bucket == ' + bucket.name + ' and x-amz-meta-foo-str >= ' + str_vals[i] + ' and (x-amz-meta-foo-str <= ' + str_vals[i + 1] + ')', lambda k: k.bucket.name == bucket.name and (k.get_metadata('foo-str') >= str_vals[i] and diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py index 83bfae19e6c1c..a9caff1e84e6e 100644 --- a/src/test/rgw/rgw_multi/zone_cloud.py +++ b/src/test/rgw/rgw_multi/zone_cloud.py @@ -61,7 +61,7 @@ def check_object_eq(k1, k2, check_extra = True): def make_request(conn, method, bucket, key, query_args, headers): result = conn.make_request(method, bucket=bucket, key=key, query_args=query_args, headers=headers) - if result.status / 100 != 2: + if result.status // 100 != 2: raise boto.exception.S3ResponseError(result.status, result.reason, result.read()) return result diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py index 1f85744a49cec..7ba31a4307898 100644 --- a/src/test/rgw/rgw_multi/zone_es.py +++ b/src/test/rgw/rgw_multi/zone_es.py @@ -48,7 +48,7 @@ def check_object_eq(k1, k2, check_extra = True): def make_request(conn, method, bucket, key, query_args, headers): result = conn.make_request(method, bucket=bucket, key=key, query_args=query_args, headers=headers) - if result.status / 100 != 2: + if result.status // 100 != 2: raise boto.exception.S3ResponseError(result.status, result.reason, result.read()) return result -- 2.39.5