python3: get rid of xrange

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/suite/test/test_build_matrix.py b/teuthology/suite/test/test_build_matrix.py
index 946126d801da3431c15452cfd7f16f5cce6431da..e4e58ab38ffc1fc4ed3d8ca6af26a0d81a3d04ba 100644 (file)
--- a/teuthology/suite/test/test_build_matrix.py
+++ b/teuthology/suite/test/test_build_matrix.py
@@ -698,7 +698,7 @@ class TestSubset(object):
                     mat,
                     0,
                     mat.size())
-                for i, desc in zip(xrange(mat.size()), all_desc):
+                for i, desc in zip(range(mat.size()), all_desc):
                     if i == first:
                         print '=========='
                     print i, desc
@@ -707,7 +707,7 @@ class TestSubset(object):
             assert found
 
     def test_random(self):
-        for i in xrange(10000):
+        for i in range(10000):
             tree = self.generate_fake_fs(
                 self.MAX_FACETS,
                 self.MAX_FANOUT,

diff --git a/teuthology/suite/test/test_run_.py b/teuthology/suite/test/test_run_.py
index 0b843fb93ca2f86c7b5f5c623fe20d32d43506b1..b89a710d9ddd751146bcd44c21264361418b1df6 100644 (file)
--- a/teuthology/suite/test/test_run_.py
+++ b/teuthology/suite/test/test_run_.py
@@ -307,11 +307,11 @@ class TestScheduleSuite(object):
             (build_matrix_desc, build_matrix_frags),
         ]
         m_build_matrix.return_value = build_matrix_output
-        m_open.side_effect = [StringIO('field: val\n') for i in xrange(11)]
+        m_open.side_effect = [StringIO('field: val\n') for i in range(11)]
         m_get_install_task_flavor.return_value = 'basic'
         m_get_package_versions.return_value = dict()
         m_has_packages_for_distro.side_effect = [
-            False for i in xrange(11)
+            False for i in range(11)
         ]
 
         m_find_git_parent.side_effect = lambda proj, sha1: sha1 + '^'
@@ -323,7 +323,7 @@ class TestScheduleSuite(object):
             runobj.schedule_suite()
         assert 'Exceeded 10 backtracks' in str(exc.value)
         m_find_git_parent.assert_has_calls(
-            [call('ceph', 'ceph_sha1' + i * '^') for i in xrange(10)]
+            [call('ceph', 'ceph_sha1' + i * '^') for i in range(10)]
         )
 
     @patch('teuthology.suite.util.find_git_parent')
@@ -367,7 +367,7 @@ class TestScheduleSuite(object):
         ]
         m_build_matrix.return_value = build_matrix_output
         m_open.side_effect = [
-            StringIO('field: val\n') for i in xrange(NUM_FAILS+1)
+            StringIO('field: val\n') for i in range(NUM_FAILS+1)
         ] + [
             contextlib.closing(StringIO())
         ] 
@@ -375,7 +375,7 @@ class TestScheduleSuite(object):
         m_get_package_versions.return_value = dict()
         # NUM_FAILS, then success
         m_has_packages_for_distro.side_effect = \
-            [False for i in xrange(NUM_FAILS)] + [True]
+            [False for i in range(NUM_FAILS)] + [True]
 
         m_find_git_parent.side_effect = lambda proj, sha1: sha1 + '^'
 
@@ -386,8 +386,8 @@ class TestScheduleSuite(object):
         assert count == 1
         m_has_packages_for_distro.assert_has_calls(
             [call('ceph_sha1' + '^' * i, 'ubuntu', '14.04', 'basic', {})
-             for i in xrange(NUM_FAILS+1)]
+             for i in range(NUM_FAILS+1)]
         )
         m_find_git_parent.assert_has_calls(
-            [call('ceph', 'ceph_sha1' + i * '^') for i in xrange(NUM_FAILS)]
+            [call('ceph', 'ceph_sha1' + i * '^') for i in range(NUM_FAILS)]
         )