From 49cd06df9fafd7061a558ec34f0bd4cc08af5a09 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Mon, 13 May 2013 13:00:15 +0800 Subject: [PATCH] Fix testcase 'TestPortsV2.test_range_allocation' failed randomly Fix bug 1179370 Change-Id: Id5645546c98549c9d7cf68359e0f6fa128ad84b7 Signed-off-by: Christoph Thiel --- quantum/tests/unit/test_db_plugin.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index 0ed8970993d..a32c4ff6740 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):