diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
| commit | faba873d4b91cf03c5c2d9546a6df781ce58f2cc (patch) | |
| tree | 9fca4c5ed30c77c43023d9b365a37ec90261f2b4 /tests/handlers/test_directory.py | |
| parent | Newsfile (diff) | |
| parent | Add docs for undoing room shutdowns (#7998) (diff) | |
| download | synapse-faba873d4b91cf03c5c2d9546a6df781ce58f2cc.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_limiting_to_joins
Diffstat (limited to 'tests/handlers/test_directory.py')
| -rw-r--r-- | tests/handlers/test_directory.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 00bb776271..bc0c5aefdc 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -16,8 +16,6 @@ from mock import Mock -from twisted.internet import defer - import synapse import synapse.api.errors from synapse.api.constants import EventTypes @@ -26,6 +24,7 @@ from synapse.rest.client.v1 import directory, login, room from synapse.types import RoomAlias, create_requester from tests import unittest +from tests.test_utils import make_awaitable class DirectoryTestCase(unittest.HomeserverTestCase): @@ -71,7 +70,7 @@ class DirectoryTestCase(unittest.HomeserverTestCase): self.assertEquals({"room_id": "!8765qwer:test", "servers": ["test"]}, result) def test_get_remote_association(self): - self.mock_federation.make_query.return_value = defer.succeed( + self.mock_federation.make_query.return_value = make_awaitable( {"room_id": "!8765qwer:test", "servers": ["test", "remote"]} ) |