summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-01 09:54:36 +0100
committerDavid Baker <dave@matrix.org>2016-06-01 09:54:36 +0100
commit8e539f13c005fa94c0dfee4cf1ea04acb1aedf59 (patch)
treef888e47f736cd6f43db9983d6c802ebf669308a3 /tests
parentpep8 (diff)
parenthandle emotes & notices correctly in email notifs (diff)
downloadsynapse-8e539f13c005fa94c0dfee4cf1ea04acb1aedf59.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider
Diffstat (limited to '')
-rw-r--r--tests/handlers/test_appservice.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py
index 7ddbbb9b4a..a884c95f8d 100644
--- a/tests/handlers/test_appservice.py
+++ b/tests/handlers/test_appservice.py
@@ -30,9 +30,9 @@ class AppServiceHandlerTestCase(unittest.TestCase):
         self.mock_scheduler = Mock()
         hs = Mock()
         hs.get_datastore = Mock(return_value=self.mock_store)
-        self.handler = ApplicationServicesHandler(
-            hs, self.mock_as_api, self.mock_scheduler
-        )
+        hs.get_application_service_api = Mock(return_value=self.mock_as_api)
+        hs.get_application_service_scheduler = Mock(return_value=self.mock_scheduler)
+        self.handler = ApplicationServicesHandler(hs)
 
     @defer.inlineCallbacks
     def test_notify_interested_services(self):