Merge "Fix testcase 'test_create_subnet_with_two_host_routes' failed" into stable/grizzly

This commit is contained in:
Jenkins 2014-02-23 06:12:52 +00:00 committed by Gerrit Code Review
commit 5daa5321dd
1 changed files with 10 additions and 2 deletions

View File

@ -2339,12 +2339,20 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase):
# verify the response has each key with the correct value
for k in keys:
self.assertIn(k, subnet['subnet'])
self.assertEqual(subnet['subnet'][k], keys[k])
if isinstance(keys[k], list):
self.assertEqual(sorted(subnet['subnet'][k]),
sorted(keys[k]))
else:
self.assertEqual(subnet['subnet'][k], keys[k])
# verify the configured validations are correct
if expected:
for k in expected:
self.assertIn(k, subnet['subnet'])
self.assertEqual(subnet['subnet'][k], expected[k])
if isinstance(expected[k], list):
self.assertEqual(sorted(subnet['subnet'][k]),
sorted(expected[k]))
else:
self.assertEqual(subnet['subnet'][k], expected[k])
return subnet
def test_create_subnet(self):