openstack/zaqar
Code Issues Proposed changes

Merge "Fix incorrect usage of assertEqual() in some tests"

Browse Source
This commit is contained in:
Jenkins 2015-10-13 17:33:25 +00:00 committed by Gerrit Code Review
commit 790dfa6c67
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zaqar/tests/functional/wsgi/v1_1/test_health.py
View File

@ -74,8 +74,8 @@ class TestHealth(base.V1_1FunctionalTestBase):
self.assertEqual(200, response.status_code) self.assertEqual(200, response.status_code)
health = response.json() health = response.json()
self.assertEqual(True, health['catalog_reachable']) self.assertTrue(health['catalog_reachable'])
self.assertEqual(True, health[pool_name]['storage_reachable']) self.assertTrue(health[pool_name]['storage_reachable'])
op_status = health[pool_name]['operation_status'] op_status = health[pool_name]['operation_status']
for op in op_status.keys(): for op in op_status.keys():
self.assertTrue(op_status[op]['succeeded']) self.assertTrue(op_status[op]['succeeded'])

8
zaqar/tests/unit/storage/base.py
View File

@ -133,7 +133,7 @@ class QueueControllerTest(ControllerBaseTest):
detailed=True) detailed=True)
queues = list(next(interaction)) queues = list(next(interaction))
self.assertEqual(True, all(map(lambda queue: self.assertTrue(all(map(lambda queue:
'name' in queue and 'name' in queue and
'metadata' in queue, queues))) 'metadata' in queue, queues)))
self.assertEqual(10, len(queues)) self.assertEqual(10, len(queues))
@ -142,7 +142,7 @@ class QueueControllerTest(ControllerBaseTest):
marker=next(interaction)) marker=next(interaction))
queues = list(next(interaction)) queues = list(next(interaction))
self.assertEqual(True, all(map(lambda queue: self.assertTrue(all(map(lambda queue:
'name' in queue and 'name' in queue and
'metadata' not in queue, queues))) 'metadata' not in queue, queues)))
@ -1004,7 +1004,7 @@ class SubscriptionControllerTest(ControllerBaseTest):
project=self.project) project=self.project)
subscriptions = list(next(interaction)) subscriptions = list(next(interaction))
self.assertEqual(True, all(map(lambda s: self.assertTrue(all(map(lambda s:
'source' in s and 'subscriber' in s, 'source' in s and 'subscriber' in s,
subscriptions))) subscriptions)))
self.assertEqual(10, len(subscriptions)) self.assertEqual(10, len(subscriptions))
@ -1014,7 +1014,7 @@ class SubscriptionControllerTest(ControllerBaseTest):
marker=next(interaction))) marker=next(interaction)))
subscriptions = list(next(interaction)) subscriptions = list(next(interaction))
self.assertEqual(True, all(map(lambda s: self.assertTrue(all(map(lambda s:
'source' in s and 'subscriber' in s, 'source' in s and 'subscriber' in s,
subscriptions))) subscriptions)))
self.assertEqual(5, len(subscriptions)) self.assertEqual(5, len(subscriptions))