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_profile.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_profile.py')
| -rw-r--r-- | tests/handlers/test_profile.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py index 4f1347cd25..d70e1fc608 100644 --- a/tests/handlers/test_profile.py +++ b/tests/handlers/test_profile.py @@ -24,6 +24,7 @@ from synapse.handlers.profile import MasterProfileHandler from synapse.types import UserID from tests import unittest +from tests.test_utils import make_awaitable from tests.utils import setup_test_homeserver @@ -138,7 +139,7 @@ class ProfileTestCase(unittest.TestCase): @defer.inlineCallbacks def test_get_other_name(self): - self.mock_federation.make_query.return_value = defer.succeed( + self.mock_federation.make_query.return_value = make_awaitable( {"displayname": "Alice"} ) |