openstack
/
nova
Code Issues Proposed changes

[Py34] nova.tests.unit.api.openstack.test_common 

Tests from `nova.tests.unit.api.openstack.test_common` are broken in
Python 3 environment since range function doesn't return a list object as
in Python 2.
Since list objects are expected only in assertEqual methods to check empty
ranges, we can check length of returned object.

* https://docs.python.org/3/library/functions.html#func-range

Change-Id: I025bbb66d5446c76d89ef086dcd12a2a454b0e31
This commit is contained in:
Andrey Kurilin 2015-09-29 16:10:35 +03:00
parent 8d5ad73abe
commit 599c4f4e7a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/unit/api/openstack/test_common.py
View File

@ -62,7 +62,7 @@ class LimiterTest(test.NoDBTestCase):
def test_limiter_offset_medium(self):
# Test offset key works with a medium sized number.
req = webob.Request.blank('/?offset=10')
self.assertEqual(common.limited(self.tiny, req), [])
self.assertEqual(0, len(common.limited(self.tiny, req)))
self.assertEqual(common.limited(self.small, req), self.small[10:])
self.assertEqual(common.limited(self.medium, req), self.medium[10:])
self.assertEqual(common.limited(self.large, req), self.large[10:1010])
@ -70,9 +70,9 @@ class LimiterTest(test.NoDBTestCase):
def test_limiter_offset_over_max(self):
# Test offset key works with a number over 1000 (max_limit).
req = webob.Request.blank('/?offset=1001')
self.assertEqual(common.limited(self.tiny, req), [])
self.assertEqual(common.limited(self.small, req), [])
self.assertEqual(common.limited(self.medium, req), [])
self.assertEqual(0, len(common.limited(self.tiny, req)))
self.assertEqual(0, len(common.limited(self.small, req)))
self.assertEqual(0, len(common.limited(self.medium, req)))
self.assertEqual(
common.limited(self.large, req), self.large[1001:2001])
@ -130,7 +130,7 @@ class LimiterTest(test.NoDBTestCase):
req = webob.Request.blank('/?offset=3&limit=1500')
self.assertEqual(common.limited(items, req), items[3:1003])
req = webob.Request.blank('/?offset=3000&limit=10')
self.assertEqual(common.limited(items, req), [])
self.assertEqual(0, len(common.limited(items, req)))
def test_limiter_custom_max_limit(self):
# Test a max_limit other than 1000.
@ -145,7 +145,7 @@ class LimiterTest(test.NoDBTestCase):
self.assertEqual(
common.limited(items, req, max_limit=2000), items[3:])
req = webob.Request.blank('/?offset=3000&limit=10')
self.assertEqual(common.limited(items, req, max_limit=2000), [])
self.assertEqual(0, len(common.limited(items, req, max_limit=2000)))
def test_limiter_negative_limit(self):
# Test a negative limit.

1
tests-py3.txt
View File

@ -140,7 +140,6 @@ nova.tests.unit.api.openstack.compute.test_volumes.VolumeApiTestV2
nova.tests.unit.api.openstack.compute.test_volumes.VolumeApiTestV21
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV2
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV21
nova.tests.unit.api.openstack.test_common.LimiterTest
nova.tests.unit.api.openstack.test_faults.TestFaultWrapper
nova.tests.unit.api.openstack.test_faults.TestFaults
nova.tests.unit.api.openstack.test_wsgi.JSONDeserializerTest