openstack
/
ironic
Code Issues Proposed changes

Use range instead xrange to keep python 3.X compatibility 

xrange is replaced by range in python3. Lists that be created
in the test cases are short, so just use range instead.

closes-bug: #1291191

Change-Id: I8e604ea62150905563cb90aa0d227b11628e9ecc
This commit is contained in:
Fengqian Gao 2014-03-12 16:31:14 +08:00
parent 287fe8478a
commit 5e4ef7d4f1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic/nova/tests/scheduler/test_ironic_host_manager.py
View File

@ -43,9 +43,9 @@ class IronicHostManagerTestCase(test.NoDBTestCase):
super(IronicHostManagerTestCase, self).setUp()
self.host_manager = ironic_host_manager.IronicHostManager()
self.fake_hosts = [ironic_host_manager.IronicNodeState(
'fake_host%s' % x, 'fake-node') for x in xrange(1, 5)]
'fake_host%s' % x, 'fake-node') for x in range(1, 5)]
self.fake_hosts += [ironic_host_manager.IronicNodeState(
'fake_multihost', 'fake-node%s' % x) for x in xrange(1, 5)]
'fake_multihost', 'fake-node%s' % x) for x in range(1, 5)]
self.addCleanup(timeutils.clear_time_override)
def test_get_all_host_states(self):
@ -62,7 +62,7 @@ class IronicHostManagerTestCase(test.NoDBTestCase):
self.assertEqual(len(host_states_map), 4)
# Check that .service is set properly
for i in xrange(4):
for i in range(4):
compute_node = ironic_fakes.COMPUTE_NODES[i]
host = compute_node['service']['host']
node = compute_node['hypervisor_hostname']
@ -208,9 +208,9 @@ class IronicHostManagerTestFilters(test.NoDBTestCase):
super(IronicHostManagerTestFilters, self).setUp()
self.host_manager = ironic_host_manager.IronicHostManager()
self.fake_hosts = [ironic_host_manager.IronicNodeState(
'fake_host%s' % x, 'fake-node') for x in xrange(1, 5)]
'fake_host%s' % x, 'fake-node') for x in range(1, 5)]
self.fake_hosts += [ironic_host_manager.IronicNodeState(
'fake_multihost', 'fake-node%s' % x) for x in xrange(1, 5)]
'fake_multihost', 'fake-node%s' % x) for x in range(1, 5)]
self.addCleanup(timeutils.clear_time_override)
def test_choose_host_filters_not_found(self):

2
ironic/tests/db/test_nodes.py
View File

@ -101,7 +101,7 @@ class DbNodeTestCase(base.DbTestCase):
n = utils.get_test_node(id=i, uuid=ironic_utils.generate_uuid())
self.dbapi.create_node(n)
res = [i[0] for i in self.dbapi.get_nodeinfo_list()]
self.assertEqual(sorted(res), sorted(xrange(1, 6)))
self.assertEqual(sorted(res), sorted(range(1, 6)))
def test_get_nodeinfo_list_with_cols(self):
uuids = {}