diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-23 06:20:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-23 06:20:30 +0000 |
| commit | 111a6af48763d8c56049cf0c666f3ddeeef3269e (patch) | |
| tree | dccda4665d37ed65d11b50767230e4dda05706d4 | |
| parent | 5daa5321dd57805bbc95e6fac50aecb5f6431c62 (diff) | |
| parent | 49cd06df9fafd7061a558ec34f0bd4cc08af5a09 (diff) | |
| download | neutron-111a6af48763d8c56049cf0c666f3ddeeef3269e.tar.gz | |
Merge "Fix testcase 'TestPortsV2.test_range_allocation' failed randomly" into stable/grizzlygrizzly-eol2013.1.5
| -rw-r--r-- | quantum/tests/unit/test_db_plugin.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index a97eb75de5..a3bae568c2 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -1409,10 +1409,12 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(len(ips), 5) alloc = ['10.0.0.1', '10.0.0.2', '10.0.0.4', '10.0.0.5', '10.0.0.6'] - for i in range(len(alloc)): - self.assertEqual(ips[i]['ip_address'], alloc[i]) - self.assertEqual(ips[i]['subnet_id'], + for ip in ips: + self.assertIn(ip['ip_address'], alloc) + self.assertEqual(ip['subnet_id'], subnet['subnet']['id']) + alloc.remove(ip['ip_address']) + self.assertEqual(len(alloc), 0) self._delete('ports', port['port']['id']) with self.subnet(gateway_ip='11.0.0.6', @@ -1430,10 +1432,12 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(len(ips), 5) alloc = ['11.0.0.1', '11.0.0.2', '11.0.0.3', '11.0.0.4', '11.0.0.5'] - for i in range(len(alloc)): - self.assertEqual(ips[i]['ip_address'], alloc[i]) - self.assertEqual(ips[i]['subnet_id'], + for ip in ips: + self.assertIn(ip['ip_address'], alloc) + self.assertEqual(ip['subnet_id'], subnet['subnet']['id']) + alloc.remove(ip['ip_address']) + self.assertEqual(len(alloc), 0) self._delete('ports', port['port']['id']) def test_requested_invalid_fixed_ips(self): |