aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hurst2017-05-11 17:47:52 -0600
committerDavid Hurst2017-05-11 17:50:41 -0600
commite08c635b9d96fab4292d50ebe97b66a641d4a79a (patch)
treeca7672ed2ad27d0bcb5e117f44e94653471305f2
parent663a269045f2224d98b93412ad74195ca9d9079a (diff)
downloadeventmq-e08c635b9d96fab4292d50ebe97b66a641d4a79a.tar.gz
eventmq-e08c635b9d96fab4292d50ebe97b66a641d4a79a.zip
add msgid to mocks
-rw-r--r--eventmq/tests/test_client_jobs.py7
-rw-r--r--eventmq/tests/test_client_messages.py7
2 files changed, 9 insertions, 5 deletions
diff --git a/eventmq/tests/test_client_jobs.py b/eventmq/tests/test_client_jobs.py
index c658187..c66875a 100644
--- a/eventmq/tests/test_client_jobs.py
+++ b/eventmq/tests/test_client_jobs.py
@@ -34,13 +34,13 @@ class TestCase(unittest.TestCase):
34 self.assertEqual(d(), 12) 34 self.assertEqual(d(), 12)
35 self.assertEqual(d.delay(), '43e14eaa-2034-4c84-8fe7-5577c70b6a7c') 35 self.assertEqual(d.delay(), '43e14eaa-2034-4c84-8fe7-5577c70b6a7c')
36 defer_job_mock.assert_called_with(Sender_mock(), test_func, args=(), 36 defer_job_mock.assert_called_with(Sender_mock(), test_func, args=(),
37 kwargs={}, queue=None) 37 msgid=None, kwargs={}, queue=None)
38 38
39 d = jobs.job(test_func, broker_addr=self.BROKER_ADDR, queue='mojo') 39 d = jobs.job(test_func, broker_addr=self.BROKER_ADDR, queue='mojo')
40 d.delay(1, 2, three=3) 40 d.delay(1, 2, three=3)
41 defer_job_mock.assert_called_with(Sender_mock(), test_func, 41 defer_job_mock.assert_called_with(Sender_mock(), test_func,
42 args=(1, 2), kwargs={'three': 3}, 42 args=(1, 2), kwargs={'three': 3},
43 queue='mojo') 43 msgid=None, queue='mojo')
44 44
45 @mock.patch('eventmq.client.messages.defer_job') 45 @mock.patch('eventmq.client.messages.defer_job')
46 @mock.patch('eventmq.client.jobs.Sender') 46 @mock.patch('eventmq.client.jobs.Sender')
@@ -85,7 +85,8 @@ class TestCase(unittest.TestCase):
85 sched_mock.assert_called_with( 85 sched_mock.assert_called_with(
86 Sender_mock(), test_func, args=(), class_args=(), 86 Sender_mock(), test_func, args=(), class_args=(),
87 class_kwargs=None, cron=None, headers=('guarantee',), 87 class_kwargs=None, cron=None, headers=('guarantee',),
88 interval_secs=None, kwargs=None, queue='default', unschedule=True) 88 interval_secs=None, kwargs=None, queue='default',
89 unschedule=True)
89 90
90 91
91def test_func(): 92def test_func():
diff --git a/eventmq/tests/test_client_messages.py b/eventmq/tests/test_client_messages.py
index 68b847e..8939e9b 100644
--- a/eventmq/tests/test_client_messages.py
+++ b/eventmq/tests/test_client_messages.py
@@ -86,6 +86,7 @@ class TestCase(unittest.TestCase):
86 guarantee=False, 86 guarantee=False,
87 retry_count=3, 87 retry_count=3,
88 timeout=0, 88 timeout=0,
89 msgid=None,
89 queue='test_queue') 90 queue='test_queue')
90 91
91 with LogCapture() as log_checker: 92 with LogCapture() as log_checker:
@@ -259,7 +260,8 @@ class TestCase(unittest.TestCase):
259 socket, 'REQUEST', 260 socket, 'REQUEST',
260 ('mozo', 261 ('mozo',
261 'reply-requested,retry-count:2', 262 'reply-requested,retry-count:2',
262 messages.serialize(msg))) 263 messages.serialize(msg)),
264 msgid=None)
263 265
264 @mock.patch('eventmq.client.messages.send_emqp_message') 266 @mock.patch('eventmq.client.messages.send_emqp_message')
265 def test_send_request_all_headers(self, snd_empq_msg_mock): 267 def test_send_request_all_headers(self, snd_empq_msg_mock):
@@ -282,7 +284,8 @@ class TestCase(unittest.TestCase):
282 socket, 'REQUEST', 284 socket, 'REQUEST',
283 ('default', 285 ('default',
284 'reply-requested,guarantee,retry-count:2,timeout:3', 286 'reply-requested,guarantee,retry-count:2,timeout:3',
285 messages.serialize(msg))) 287 messages.serialize(msg)),
288 msgid=None)
286 289
287 @mock.patch('eventmq.client.messages.send_emqp_message') 290 @mock.patch('eventmq.client.messages.send_emqp_message')
288 def test_send_schedule_request(self, snd_empq_msg_mock): 291 def test_send_schedule_request(self, snd_empq_msg_mock):