openstack/manila
Code Issues Proposed changes

Merge "Remove ordering attempts of 'unorderable types'"

Browse Source
This commit is contained in:
Zuul 2018-04-25 12:13:45 +00:00 committed by Gerrit Code Review
commit 9b218b45ad
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manila/tests/db/sqlalchemy/test_api.py
View File

@ -161,8 +161,11 @@ class ShareAccessDatabaseAPITestCase(test.TestCase):
share_access_keys_present = True if with_share_access_data else False share_access_keys_present = True if with_share_access_data else False
actual_access_ids = [r['access_id'] for r in rules] actual_access_ids = [r['access_id'] for r in rules]
self.assertEqual(sorted([access_1['id'], access_2['id']]), self.assertTrue(isinstance(actual_access_ids, list))
sorted(actual_access_ids)) expected = [access_1['id'], access_2['id']]
self.assertEqual(len(expected), len(actual_access_ids))
for pool in expected:
self.assertIn(pool, actual_access_ids)
for rule in rules: for rule in rules:
for key in share_access_keys: for key in share_access_keys:
self.assertEqual(share_access_keys_present, key in rule) self.assertEqual(share_access_keys_present, key in rule)

4
manila/tests/scheduler/test_host_manager.py
View File

@ -589,8 +589,10 @@ class HostManagerTestCase(test.TestCase):
}, },
}, },
] ]
self.assertTrue(isinstance(res, list))
self.assertEqual(len(expected), len(res)) self.assertEqual(len(expected), len(res))
self.assertEqual(sorted(expected), sorted(res)) for pool in expected:
self.assertIn(pool, res)
@ddt.data( @ddt.data(
None, None,

14
manila/tests/share/test_access.py
View File

@ -454,8 +454,11 @@ class ShareInstanceAccessTestCase(test.TestCase):
# Asserts # Asserts
self.assertIsNone(retval) self.assertIsNone(retval)
self.assertEqual(share_instance_id, call_args[1]['id']) self.assertEqual(share_instance_id, call_args[1]['id'])
self.assertEqual(sorted(expected_rules_to_be_on_share), self.assertTrue(isinstance(access_rules_to_be_on_share, list))
sorted(access_rules_to_be_on_share)) self.assertEqual(len(expected_rules_to_be_on_share),
len(access_rules_to_be_on_share))
for pool in expected_rules_to_be_on_share:
self.assertIn(pool, access_rules_to_be_on_share)
self.assertEqual(1, len(call_kwargs['add_rules'])) self.assertEqual(1, len(call_kwargs['add_rules']))
self.assertEqual(rule_2['id'], call_kwargs['add_rules'][0]['id']) self.assertEqual(rule_2['id'], call_kwargs['add_rules'][0]['id'])
self.assertEqual(1, len(call_kwargs['delete_rules'])) self.assertEqual(1, len(call_kwargs['delete_rules']))
@ -659,8 +662,11 @@ class ShareInstanceAccessTestCase(test.TestCase):
self.assertIsNone(retval) self.assertIsNone(retval)
self.assertEqual(instance['id'], call_args[1]['id']) self.assertEqual(instance['id'], call_args[1]['id'])
self.assertEqual(sorted(expected_rules_to_be_on_share), self.assertTrue(isinstance(access_rules_to_be_on_share, list))
sorted(access_rules_to_be_on_share)) self.assertEqual(len(expected_rules_to_be_on_share),
len(access_rules_to_be_on_share))
for pool in expected_rules_to_be_on_share:
self.assertIn(pool, access_rules_to_be_on_share)
self.assertEqual(['ro'] * len(expected_rules_to_be_on_share), self.assertEqual(['ro'] * len(expected_rules_to_be_on_share),
access_levels) access_levels)
self.assertEqual(0, len(call_kwargs['add_rules'])) self.assertEqual(0, len(call_kwargs['add_rules']))