summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-29 16:58:13 +0000
committerGerrit Code Review <review@openstack.org>2014-09-29 16:58:13 +0000
commit7e38b552e45726771d425174528f3d74f71fc64b (patch)
tree3dd6154b0b8d7dfef910d0c9c2b1c8d4aad68cda
parentfd50ff4d243fbd4590b24b96039361504b45b49f (diff)
parent2abb77b4dadd4150f554f134ec99b07c2b28900f (diff)
downloadneutron-7e38b552e45726771d425174528f3d74f71fc64b.tar.gz
Merge "Do not assume order of report list elements"
-rw-r--r--neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
index f08364894c..fe373055c6 100644
--- a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
+++ b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
@@ -14,6 +14,7 @@
import copy
import httplib
+import operator
import mock
@@ -1530,7 +1531,8 @@ class TestCiscoCsrIPsecDeviceDriverSyncStatuses(base.BaseTestCase):
u'4': {u'status': constants.ACTIVE,
u'updated_pending_status': True}}
}]
- self.assertEqual(expected_report, report)
+ self.assertEqual(expected_report,
+ sorted(report, key=operator.itemgetter('id')))
# Check that service and connection statuses are updated
self.assertEqual(constants.ACTIVE, vpn_service1.last_status)
self.assertEqual(constants.ACTIVE,