openstack/neutron
Code Issues Proposed changes

tests: change order of assertion in _validate/compare_resource

Browse Source 
The order of assertEqual should be assertEqual(expected, observed).
In _validate_resource, the 'resource' is observed value,
and 'keys' is expected value.

Change-Id: Id2f561f64681065590b9bdc4ef28d1e8104261fb
This commit is contained in:
Artur Korzeniewski 2016-12-14 12:13:31 +01:00
parent 8006b2e192
commit aed187d8d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -768,20 +768,20 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
for k in expected_res: for k in expected_res:
self.assertIn(k, observed_res[res_name]) self.assertIn(k, observed_res[res_name])
if isinstance(expected_res[k], list): if isinstance(expected_res[k], list):
self.assertEqual(sorted(observed_res[res_name][k]), self.assertEqual(sorted(expected_res[k]),
sorted(expected_res[k])) sorted(observed_res[res_name][k]))
else: else:
self.assertEqual(observed_res[res_name][k], expected_res[k]) self.assertEqual(expected_res[k], observed_res[res_name][k])
def _validate_resource(self, resource, keys, res_name): def _validate_resource(self, resource, keys, res_name):
for k in keys: for k in keys:
self.assertIn(k, resource[res_name]) self.assertIn(k, resource[res_name])
if isinstance(keys[k], list): if isinstance(keys[k], list):
self.assertEqual( self.assertEqual(
sorted(resource[res_name][k], key=helpers.safe_sort_key), sorted(keys[k], key=helpers.safe_sort_key),
sorted(keys[k], key=helpers.safe_sort_key)) sorted(resource[res_name][k], key=helpers.safe_sort_key))
else: else:
self.assertEqual(resource[res_name][k], keys[k]) self.assertEqual(keys[k], resource[res_name][k])
class TestBasicGet(NeutronDbPluginV2TestCase): class TestBasicGet(NeutronDbPluginV2TestCase):