qa,tes: s/xrange/range/

use six.moves.range for python3 copatibility, we can drop six after
migrating to python3.

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

Conflicts:
	qa/tasks/cephfs/test_failover.py: trivial resolution

diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index dc5cb786d731609d9a99dc13cb7981bf871eb3d7..c87afbf6724080178892e52ad9d7b9e481ac748a 100644 (file)
--- a/qa/tasks/cephfs/test_failover.py
+++ b/qa/tasks/cephfs/test_failover.py
@@ -3,6 +3,7 @@ import signal
 import logging
 from unittest import case, SkipTest
 from random import randint
+from six.moves import range
 
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from teuthology.exceptions import CommandFailedError

diff --git a/qa/tasks/cephfs/test_openfiletable.py b/qa/tasks/cephfs/test_openfiletable.py
index 4306965c75c37b69835e22e7df79d7d7c8a97a24..36e212d7bc630df9e44a9542a3c63706f5ea24ef 100644 (file)
--- a/qa/tasks/cephfs/test_openfiletable.py
+++ b/qa/tasks/cephfs/test_openfiletable.py
@@ -22,7 +22,7 @@ class OpenFileTable(CephFSTestCase):
 
         # Hold the file open
         file_count = 8
-        for i in xrange(0, file_count):
+        for i in range(0, file_count):
             filename = "open_file{}".format(i)
             p = self.mount_a.open_background(filename)
             self.mount_a.write_n_mb(filename, size_mb)

diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index 31b8233c0316cdd30133f72165a601b0c04e2df8..0e108914176d2b956f519a4d7234d8349974a3bc 100644 (file)
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -12,6 +12,7 @@ except ImportError:
     from itertools import zip_longest
 from itertools import combinations
 from six import StringIO
+from six.moves import range
 
 import boto
 import boto.s3.connection
@@ -516,7 +517,7 @@ def create_bucket_per_zone(zonegroup_conns, buckets_per_zone = 1):
     buckets = []
     zone_bucket = []
     for zone in zonegroup_conns.rw_zones:
-        for i in xrange(buckets_per_zone):
+        for i in range(buckets_per_zone):
             bucket_name = gen_bucket_name()
             log.info('create bucket zone=%s name=%s', zone.name, bucket_name)
             bucket = zone.create_bucket(bucket_name)

diff --git a/src/test/rgw/rgw_multi/tests_es.py b/src/test/rgw/rgw_multi/tests_es.py
index e6c0bb3a1062fd5603ce3d6cc365f59a8fe65ded..d000c2d41e55a65a87afd8c652d0ff7fdd9192fc 100644 (file)
--- a/src/test/rgw/rgw_multi/tests_es.py
+++ b/src/test/rgw/rgw_multi/tests_es.py
@@ -8,6 +8,7 @@ import datetime
 import dateutil
 
 from nose.tools import eq_ as eq
+from six.moves import range
 
 from .multisite import *
 from .tests import *
@@ -77,7 +78,7 @@ def init_env(create_obj, num_keys = 5, buckets_per_zone = 1, bucket_init_cb = No
 
     # don't wait for meta sync just yet
     for zone, bucket in zone_bucket:
-        for count in xrange(0, num_keys):
+        for count in range(num_keys):
             objname = obj_prefix + str(count)
             k = new_key(zone, bucket.name, objname)
             # k.set_contents_from_string(content + 'x' * count)
@@ -226,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 xrange(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 xrange(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 xrange(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