diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-08 10:30:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-08 10:30:44 +0000 |
| commit | 176b79546bd51ae64fb705e01ec4c9026ebec623 (patch) | |
| tree | 56e0345bb90e3f95d1f7bd2ce23e3626745ac6a3 | |
| parent | ec990c34801038c7aea019843202560f106b8713 (diff) | |
| parent | 599c4f4e7a663192b63aed4ea7d89404f5bc619c (diff) | |
| download | nova-176b79546bd51ae64fb705e01ec4c9026ebec623.tar.gz | |
Merge "[Py34] nova.tests.unit.api.openstack.test_common"
| -rw-r--r-- | nova/tests/unit/api/openstack/test_common.py | 12 | ||||
| -rw-r--r-- | tests-py3.txt | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nova/tests/unit/api/openstack/test_common.py b/nova/tests/unit/api/openstack/test_common.py index 55cce9793d..e368918690 100644 --- a/nova/tests/unit/api/openstack/test_common.py +++ b/nova/tests/unit/api/openstack/test_common.py @@ -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. diff --git a/tests-py3.txt b/tests-py3.txt index 37117f35bc..4a160f1790 100644 --- a/tests-py3.txt +++ b/tests-py3.txt @@ -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 |