From eb104b2c6bd071d2df123c9041735740b5e56feb Mon Sep 17 00:00:00 2001 From: MD NADEEM Date: Mon, 28 Sep 2015 21:17:44 +0900 Subject: [PATCH] Fix order of arguments in assertEqual Some tests used incorrect order assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). This patch fix the issue in the module /tests/queues/ of zaqarclient. The review is generated part-wise to ease review process. Partial-Bug: #1259292 Change-Id: I405ca85d497361b41ada5eab567dd9735e787c32 --- zaqarclient/tests/queues/claims.py | 4 ++-- zaqarclient/tests/queues/flavor.py | 16 ++++++++-------- zaqarclient/tests/queues/pool.py | 18 +++++++++--------- zaqarclient/tests/queues/queues.py | 26 +++++++++++++------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/zaqarclient/tests/queues/claims.py b/zaqarclient/tests/queues/claims.py index 01b13cbd..26da4133 100644 --- a/zaqarclient/tests/queues/claims.py +++ b/zaqarclient/tests/queues/claims.py @@ -54,7 +54,7 @@ class QueueV1ClaimUnitTest(base.QueuesTestBase): def test_claim_limit(self): def verify_limit(request): self.assertIn('limit', request.params) - self.assertEqual(request.params['limit'], 10) + self.assertEqual(10, request.params['limit']) # NOTE(flaper87): We don't care about the response here, # fake it. return response.Response(None, "{0: [], 'messages': []}") @@ -138,7 +138,7 @@ class QueuesV1ClaimFunctionalTest(base.QueuesTestBase): res = queue.claim(ttl=100, grace=100) claim_id = res.id cl = queue.claim(id=claim_id) - self.assertEqual(cl.id, claim_id) + self.assertEqual(claim_id, cl.id) def test_claim_create_delete_functional(self): queue = self.client.queue("test_queue") diff --git a/zaqarclient/tests/queues/flavor.py b/zaqarclient/tests/queues/flavor.py index ee97758f..cd76bd69 100644 --- a/zaqarclient/tests/queues/flavor.py +++ b/zaqarclient/tests/queues/flavor.py @@ -40,8 +40,8 @@ class QueuesV1_1FlavorUnitTest(base.QueuesTestBase): # ensure exists in the client instance # since auto_create's default is True flavor = self.client.flavor('tasty', **flavor_data) - self.assertEqual(flavor.name, 'tasty') - self.assertEqual(flavor.pool, 'stomach') + self.assertEqual('tasty', flavor.name) + self.assertEqual('stomach', flavor.pool) def test_flavor_get(self): flavor_data = {'pool': 'stomach'} @@ -56,8 +56,8 @@ class QueuesV1_1FlavorUnitTest(base.QueuesTestBase): # ensure exists in the client instance # since auto_create's default is True flavor = self.client.flavor('test') - self.assertEqual(flavor.name, 'test') - self.assertEqual(flavor.pool, 'stomach') + self.assertEqual('test', flavor.name) + self.assertEqual('stomach', flavor.pool) def test_flavor_update(self): flavor_data = {'pool': 'stomach'} @@ -130,8 +130,8 @@ class QueuesV1_1FlavorFunctionalTest(base.QueuesTestBase): flavor = self.client.flavor('tasty', **flavor_data) self.addCleanup(flavor.delete) - self.assertEqual(flavor.name, 'tasty') - self.assertEqual(flavor.pool, 'us') + self.assertEqual('tasty', flavor.name) + self.assertEqual('us', flavor.pool) def test_flavor_get(self): pool_data = {'weight': 10, @@ -147,8 +147,8 @@ class QueuesV1_1FlavorFunctionalTest(base.QueuesTestBase): flavor = self.client.flavor('tasty') self.addCleanup(flavor.delete) - self.assertEqual(flavor.name, 'tasty') - self.assertEqual(flavor.pool, 'us') + self.assertEqual('tasty', flavor.name) + self.assertEqual('us', flavor.pool) def test_flavor_update(self): pool_data = {'weight': 10, diff --git a/zaqarclient/tests/queues/pool.py b/zaqarclient/tests/queues/pool.py index ce75c280..15b15614 100644 --- a/zaqarclient/tests/queues/pool.py +++ b/zaqarclient/tests/queues/pool.py @@ -38,8 +38,8 @@ class QueuesV1PoolUnitTest(base.QueuesTestBase): # ensure exists in the client instance # since auto_create's default is True pool = self.client.pool('test', **pool_data) - self.assertEqual(pool.name, 'test') - self.assertEqual(pool.weight, 10) + self.assertEqual('test', pool.name) + self.assertEqual(10, pool.weight) def test_pool_get(self): pool_data = {'weight': 10, @@ -56,8 +56,8 @@ class QueuesV1PoolUnitTest(base.QueuesTestBase): # ensure exists in the client instance # since auto_create's default is True pool = self.client.pool('test') - self.assertEqual(pool.name, 'test') - self.assertEqual(pool.weight, 10) + self.assertEqual('test', pool.name) + self.assertEqual(10, pool.weight) def test_pool_update(self): pool_data = {'weight': 10, @@ -133,9 +133,9 @@ class QueuesV1_1PoolFunctionalTest(base.QueuesTestBase): self.client.pool('test', **pool_data) pool = self.client.pool('test') - self.assertEqual(pool.name, 'test') - self.assertEqual(pool.weight, 10) - self.assertEqual(pool.uri, 'mongodb://127.0.0.1:27017') + self.assertEqual('test', pool.name) + self.assertEqual(10, pool.weight) + self.assertEqual('mongodb://127.0.0.1:27017', pool.uri) def test_pool_create(self): pool_data = {'weight': 10, @@ -144,8 +144,8 @@ class QueuesV1_1PoolFunctionalTest(base.QueuesTestBase): pool = self.client.pool('test', **pool_data) self.addCleanup(pool.delete) - self.assertEqual(pool.name, 'test') - self.assertEqual(pool.weight, 10) + self.assertEqual('test', pool.name) + self.assertEqual(10, pool.weight) def test_pool_update(self): pool_data = {'weight': 10, diff --git a/zaqarclient/tests/queues/queues.py b/zaqarclient/tests/queues/queues.py index ad44b5d5..a0431bbb 100644 --- a/zaqarclient/tests/queues/queues.py +++ b/zaqarclient/tests/queues/queues.py @@ -35,7 +35,7 @@ class QueuesV1QueueUnitTest(base.QueuesTestBase): send_method.return_value = resp metadata = self.queue.metadata(test_metadata) - self.assertEqual(metadata, test_metadata) + self.assertEqual(test_metadata, metadata) def test_queue_metadata_update(self): test_metadata = {'type': 'Bank Accounts'} @@ -48,10 +48,10 @@ class QueuesV1QueueUnitTest(base.QueuesTestBase): send_method.return_value = resp metadata = self.queue.metadata(test_metadata) - self.assertEqual(metadata, test_metadata) + self.assertEqual(test_metadata, metadata) metadata = self.queue.metadata(new_meta) - self.assertEqual(metadata, new_meta) + self.assertEqual(new_meta, metadata) def test_queue_create(self): with mock.patch.object(self.transport, 'send', @@ -227,7 +227,7 @@ class QueuesV1QueueUnitTest(base.QueuesTestBase): rst = self.queue.delete_messages('50b68a50d6f5b8c8a7c62b01', '50b68a50d6f5b8c8a7c62b02') - self.assertEqual(rst, None) + self.assertEqual(None, rst) # NOTE(flaper87): Nothing to assert here, # just checking our way down to the transport @@ -267,7 +267,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): queue._get_transport = mock.Mock(return_value=self.transport) queue.post(messages) stats = queue.stats - self.assertEqual(stats["messages"]["free"], 3) + self.assertEqual(3, stats["messages"]["free"]) def test_queue_metadata_functional(self): test_metadata = {'type': 'Bank Accounts'} @@ -277,7 +277,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): # NOTE(flaper87): Clear metadata's cache queue._metadata = None metadata = queue.metadata() - self.assertEqual(metadata, test_metadata) + self.assertEqual(test_metadata, metadata) def test_queue_metadata_reload_functional(self): test_metadata = {'type': 'Bank Accounts'} @@ -288,7 +288,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): # but don't clear it. queue._metadata = 'test' metadata = queue.metadata(force_reload=True) - self.assertEqual(metadata, test_metadata) + self.assertEqual(test_metadata, metadata) def test_message_post_functional(self): messages = [ @@ -301,7 +301,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): queue._get_transport = mock.Mock(return_value=self.transport) result = queue.post(messages) self.assertIn('resources', result) - self.assertEqual(len(result['resources']), 3) + self.assertEqual(3, len(result['resources'])) def test_message_list_functional(self): queue = self.client.queue("test_queue") @@ -345,7 +345,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): msg_id = res[0].split('/')[-1] msg = queue.message(msg_id) self.assertTrue(isinstance(msg, message.Message)) - self.assertEqual(msg.href, res[0]) + self.assertEqual(res[0], msg.href) def test_message_get_many_functional(self): queue = self.client.queue("test_queue") @@ -389,7 +389,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): queue.delete_messages(*msgs_id) messages = queue.messages() - self.assertEqual(len(list(messages)), 0) + self.assertEqual(0, len(list(messages))) class QueuesV1_1QueueUnitTest(QueuesV1QueueUnitTest): @@ -441,7 +441,7 @@ class QueuesV1_1QueueFunctionalTest(QueuesV1QueueFunctionalTest): queue.post(messages) queue.delete() - self.assertEqual(len(list(queue.messages(echo=True))), 0) + self.assertEqual(0, len(list(queue.messages(echo=True)))) def test_message_pop(self): queue = self.client.queue("test_queue") @@ -457,7 +457,7 @@ class QueuesV1_1QueueFunctionalTest(QueuesV1QueueFunctionalTest): queue.post(messages) messages = queue.pop(count=2) self.assertTrue(isinstance(messages, iterator._Iterator)) - self.assertEqual(len(list(messages)), 2) + self.assertEqual(2, len(list(messages))) remaining = queue.messages(echo=True) - self.assertEqual(len(list(remaining)), 1) + self.assertEqual(1, len(list(remaining)))