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/unit/queues/v1 of zaqarclient. Partial-Bug: #1259292 Change-Id: Ia5969d904012647f29b5047e37cad9ce3a77a489
This commit is contained in:
@@ -96,7 +96,7 @@ class TestV1Core(base.TestBase):
|
|||||||
|
|
||||||
req = request.Request()
|
req = request.Request()
|
||||||
result = core.queue_get_stats(self.transport, req, 'test')
|
result = core.queue_get_stats(self.transport, req, 'test')
|
||||||
self.assertEqual(result, {})
|
self.assertEqual({}, result)
|
||||||
|
|
||||||
def test_message_post_one(self):
|
def test_message_post_one(self):
|
||||||
messages = {'ttl': 30, 'body': 'Post one!'}
|
messages = {'ttl': 30, 'body': 'Post one!'}
|
||||||
@@ -110,8 +110,7 @@ class TestV1Core(base.TestBase):
|
|||||||
|
|
||||||
core.message_post(self.transport, req, 'test', messages)
|
core.message_post(self.transport, req, 'test', messages)
|
||||||
self.assertIn('queue_name', req.params)
|
self.assertIn('queue_name', req.params)
|
||||||
self.assertEqual(json.loads(req.content),
|
self.assertEqual(messages, json.loads(req.content))
|
||||||
messages)
|
|
||||||
|
|
||||||
def test_message_post_many(self):
|
def test_message_post_many(self):
|
||||||
messages = [{'ttl': 30, 'body': 'Post one!'},
|
messages = [{'ttl': 30, 'body': 'Post one!'},
|
||||||
@@ -127,8 +126,7 @@ class TestV1Core(base.TestBase):
|
|||||||
|
|
||||||
core.message_post(self.transport, req, 'test', messages)
|
core.message_post(self.transport, req, 'test', messages)
|
||||||
self.assertIn('queue_name', req.params)
|
self.assertIn('queue_name', req.params)
|
||||||
self.assertEqual(json.loads(req.content),
|
self.assertEqual(messages, json.loads(req.content))
|
||||||
messages)
|
|
||||||
|
|
||||||
def test_message_list(self):
|
def test_message_list(self):
|
||||||
with mock.patch.object(self.transport, 'send',
|
with mock.patch.object(self.transport, 'send',
|
||||||
@@ -264,4 +262,4 @@ class TestV1_1Core(TestV1Core):
|
|||||||
|
|
||||||
self.assertIn('queue_name', req.params)
|
self.assertIn('queue_name', req.params)
|
||||||
self.assertIn('pop', req.params)
|
self.assertIn('pop', req.params)
|
||||||
self.assertEqual(req.params['pop'], 5)
|
self.assertEqual(5, req.params['pop'])
|
||||||
|
@@ -42,7 +42,7 @@ class TestMessageIterator(base.QueuesTestBase):
|
|||||||
'messages',
|
'messages',
|
||||||
message.create_object(self.queue))
|
message.create_object(self.queue))
|
||||||
iterated = [msg for msg in iterator]
|
iterated = [msg for msg in iterator]
|
||||||
self.assertEqual(len(iterated), 1)
|
self.assertEqual(1, len(iterated))
|
||||||
|
|
||||||
def test_stream(self):
|
def test_stream(self):
|
||||||
messages = {'links': [],
|
messages = {'links': [],
|
||||||
@@ -73,7 +73,7 @@ class TestMessageIterator(base.QueuesTestBase):
|
|||||||
'messages',
|
'messages',
|
||||||
message.create_object(self.queue))
|
message.create_object(self.queue))
|
||||||
iterated = [msg for msg in iterator.stream()]
|
iterated = [msg for msg in iterator.stream()]
|
||||||
self.assertEqual(len(iterated), 2)
|
self.assertEqual(2, len(iterated))
|
||||||
|
|
||||||
def test_iterator_respect_paging(self):
|
def test_iterator_respect_paging(self):
|
||||||
messages = {'links': [],
|
messages = {'links': [],
|
||||||
@@ -101,7 +101,7 @@ class TestMessageIterator(base.QueuesTestBase):
|
|||||||
'messages',
|
'messages',
|
||||||
message.create_object(self.queue))
|
message.create_object(self.queue))
|
||||||
iterated = [msg for msg in iterator]
|
iterated = [msg for msg in iterator]
|
||||||
self.assertEqual(len(iterated), 1)
|
self.assertEqual(1, len(iterated))
|
||||||
|
|
||||||
|
|
||||||
class QueuesV1MessageHttpUnitTest(test_message.QueuesV1MessageUnitTest):
|
class QueuesV1MessageHttpUnitTest(test_message.QueuesV1MessageUnitTest):
|
||||||
|
Reference in New Issue
Block a user