patchを使ってmockテストをするようにした

src/kawaz/core/activities/tests/test_notifiers/test_hipchat.py

@@ -1,14 +1,11 @@
 import random
 import string
 import urllib
-from unittest.mock import MagicMock
+from unittest.mock import patch
 from django.test import override_settings
 from django.test import TestCase
-from kawaz.core.activities.notifiers import hipchat
 from kawaz.core.activities.notifiers.hipchat import HipChatActivityNotifier
 
-
-
 @override_settings(ACTIVITIES_ENABLE_HIPCHAT_NOTIFICATION=True)
 class HipChatActivityNotifierTestCase(TestCase):
     def test_send(self):
@@ -31,8 +28,9 @@ def dummy_request(url, data):
             self.assertEqual(query['from'][0], 'Kawaz')
             self.assertEqual(query['message'][0], randomstr)
 
-        hipchat.urllib.request.Request = dummy_request
-        hipchat.urllib.request.urlopen = MagicMock(return_value=None)
+        with patch('urllib.request') as request:
+            request.Request = dummy_request
+            request.urlopen.return_value = None
 
-        notifier = HipChatActivityNotifier(auth_token, room_id)
-        notifier.send(randomstr)
+            notifier = HipChatActivityNotifier(auth_token, room_id)
+            notifier.send(randomstr)

src/kawaz/core/activities/tests/test_notifiers/test_slack.py

@@ -2,10 +2,9 @@
 import string
 import json
 import urllib
-from unittest.mock import MagicMock
+from unittest.mock import patch
 from django.test import override_settings
 from django.test import TestCase
-from kawaz.core.activities.notifiers import slack
 from kawaz.core.activities.notifiers.slack import SlackAcitivityNotifier
 
 
@@ -34,13 +33,14 @@ def dummy_request(url, data):
             self.assertEqual(payload['username'], username)
             self.assertEqual(payload['text'], randomstr)
 
-        slack.urllib.request.Request = dummy_request
-        slack.urllib.request.urlopen = MagicMock(return_value=None)
+        with patch('urllib.request') as request:
+            request.Request = dummy_request
+            request.urlopen.return_value = None
 
-        options = {
-            'username': username,
-            'icon_emoji': icon_emoji,
-            'icon_url': icon_url
-        }
-        notifier = SlackAcitivityNotifier(endpoint_url, channel, options)
-        notifier.send(randomstr)
+            options = {
+                'username': username,
+                'icon_emoji': icon_emoji,
+                'icon_url': icon_url
+            }
+            notifier = SlackAcitivityNotifier(endpoint_url, channel, options)
+            notifier.send(randomstr)