From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Wed, 3 Jun 2015 13:35:58 +0000 (+0900)
Subject: test_l3: Don't assume the order of subnets
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=839706df7c742ec4b132dc6f18857679cfd870f5;p=openstack-build%2Fneutron-build.git

test_l3: Don't assume the order of subnets

Fixes test_router_add_gateway_multiple_subnets_ipv6 failures
on my environment.

Change-Id: I44b4dd0cee393ea796f35b999cc111b60ef63db1
---

diff --git a/neutron/tests/unit/extensions/test_l3.py b/neutron/tests/unit/extensions/test_l3.py
index 2392adc03..51dee1cad 100644
--- a/neutron/tests/unit/extensions/test_l3.py
+++ b/neutron/tests/unit/extensions/test_l3.py
@@ -1432,12 +1432,20 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 res = self._show('routers', r['router']['id'])
                 fips = (res['router']['external_gateway_info']
                         ['external_fixed_ips'])
-                fip_subnet_ids = [fip['subnet_id'] for fip in fips]
-                self.assertIn(s1['subnet']['id'], fip_subnet_ids)
-                self.assertNotIn(s2['subnet']['id'], fip_subnet_ids)
-                self.assertIn(s3['subnet']['id'], fip_subnet_ids)
-                self.assertIn(s4['subnet']['id'], fip_subnet_ids)
-                self.assertIn(s5['subnet']['id'], fip_subnet_ids)
+                fip_subnet_ids = {fip['subnet_id'] for fip in fips}
+                # one of s1 or s2 should be in the list.
+                if s1['subnet']['id'] in fip_subnet_ids:
+                    self.assertEqual({s1['subnet']['id'],
+                                      s3['subnet']['id'],
+                                      s4['subnet']['id'],
+                                      s5['subnet']['id']},
+                                     fip_subnet_ids)
+                else:
+                    self.assertEqual({s2['subnet']['id'],
+                                      s3['subnet']['id'],
+                                      s4['subnet']['id'],
+                                      s5['subnet']['id']},
+                                     fip_subnet_ids)
                 self._remove_external_gateway_from_router(
                     r['router']['id'],
                     n['network']['id'])