summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-17 11:30:16 +0100
committerGitHub <noreply@github.com>2016-08-17 11:30:16 +0100
commit92d39126d70477da65c478c1ffc5a6ef124833d6 (patch)
tree0cd796afb2df09502471435c77ff772485474045 /tests/handlers
parentMerge pull request #1016 from matrix-org/erikj/short_circuit_cache (diff)
parentUpdate unit tests (diff)
downloadsynapse-92d39126d70477da65c478c1ffc5a6ef124833d6.tar.xz
Merge pull request #1017 from matrix-org/erikj/appservice_measure
Measure notify_interested_services
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_appservice.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py
index a884c95f8d..3116951472 100644
--- a/tests/handlers/test_appservice.py
+++ b/tests/handlers/test_appservice.py
@@ -15,6 +15,7 @@
 
 from twisted.internet import defer
 from .. import unittest
+from tests.utils import MockClock
 
 from synapse.handlers.appservice import ApplicationServicesHandler
 
@@ -32,6 +33,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
         hs.get_datastore = Mock(return_value=self.mock_store)
         hs.get_application_service_api = Mock(return_value=self.mock_as_api)
         hs.get_application_service_scheduler = Mock(return_value=self.mock_scheduler)
+        hs.get_clock.return_value = MockClock()
         self.handler = ApplicationServicesHandler(hs)
 
     @defer.inlineCallbacks