summary refs log tree commit diff
path: root/tests/handlers/test_appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
commit82fec809a5c8be0a19bf2ca14f66d8d041dafeda (patch)
tree44adeb288d4659413e626f50e46d716401298d2a /tests/handlers/test_appservice.py
parentMerge branch 'release-v1.18.0' into matrix-org-hotfixes (diff)
parentAdd docs for undoing room shutdowns (#7998) (diff)
downloadsynapse-82fec809a5c8be0a19bf2ca14f66d8d041dafeda.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/handlers/test_appservice.py')
-rw-r--r--tests/handlers/test_appservice.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py

index ebabe9a7d6..628f7d8db0 100644 --- a/tests/handlers/test_appservice.py +++ b/tests/handlers/test_appservice.py
@@ -19,6 +19,7 @@ from twisted.internet import defer from synapse.handlers.appservice import ApplicationServicesHandler +from tests.test_utils import make_awaitable from tests.utils import MockClock from .. import unittest @@ -117,7 +118,7 @@ class AppServiceHandlerTestCase(unittest.TestCase): self._mkservice_alias(is_interested_in_alias=False), ] - self.mock_as_api.query_alias.return_value = defer.succeed(True) + self.mock_as_api.query_alias.return_value = make_awaitable(True) self.mock_store.get_app_services.return_value = services self.mock_store.get_association_from_room_alias.return_value = defer.succeed( Mock(room_id=room_id, servers=servers) @@ -135,7 +136,7 @@ class AppServiceHandlerTestCase(unittest.TestCase): def _mkservice(self, is_interested): service = Mock() - service.is_interested.return_value = defer.succeed(is_interested) + service.is_interested.return_value = make_awaitable(is_interested) service.token = "mock_service_token" service.url = "mock_service_url" return service