From 9c938c8e85a1f37711c11f40657830c8539ed292 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 3 Feb 2016 19:42:01 -0800 Subject: [PATCH] Fix webhook tests for pypy (Disconnect signal receivers after we're done with them, to avoid confusion between test cases.) --- djrill/tests/test_mandrill_webhook.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/djrill/tests/test_mandrill_webhook.py b/djrill/tests/test_mandrill_webhook.py index 0c24d09..4452687 100644 --- a/djrill/tests/test_mandrill_webhook.py +++ b/djrill/tests/test_mandrill_webhook.py @@ -94,11 +94,14 @@ class DjrillWebhookViewTests(TestCase): self.assertEqual(event_type, 'send') self.assertEqual(data, test_event) - webhook_event.connect(my_callback) + try: + webhook_event.connect(my_callback) + response = self.client.post('/webhook/?secret=abc123', { + 'mandrill_events': json.dumps([test_event]) + }) + finally: + webhook_event.disconnect(my_callback) - response = self.client.post('/webhook/?secret=abc123', { - 'mandrill_events': json.dumps([test_event]) - }) self.assertEqual(response.status_code, 200) self.assertEqual(self.signal_received_count, 1) @@ -113,10 +116,13 @@ class DjrillWebhookViewTests(TestCase): self.assertEqual(event_type, 'whitelist_add') # synthesized event_type self.assertEqual(data, test_event) - webhook_event.connect(my_callback) + try: + webhook_event.connect(my_callback) + response = self.client.post('/webhook/?secret=abc123', { + 'mandrill_events': json.dumps([test_event]) + }) + finally: + webhook_event.disconnect(my_callback) - response = self.client.post('/webhook/?secret=abc123', { - 'mandrill_events': json.dumps([test_event]) - }) self.assertEqual(response.status_code, 200) self.assertEqual(self.signal_received_count, 1)