diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:43:11 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:43:11 +0100 |
| commit | 30a19daa02cf61d2a811efb0fd619ff48ce6bcf6 (patch) | |
| tree | c430aa536e76a2329831d04ae7d8d761ed2ec188 /tests/test_federation.py | |
| parent | use an upsert to update device_lists_outbound_last_success (diff) | |
| parent | Fix typing annotations in synapse/federation (#7382) (diff) | |
| download | synapse-30a19daa02cf61d2a811efb0fd619ff48ce6bcf6.tar.xz | |
Merge branch 'develop' into rav/upsert_for_device_list
Diffstat (limited to 'tests/test_federation.py')
| -rw-r--r-- | tests/test_federation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py index 9b5cf562f3..f297de95f1 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py @@ -27,8 +27,10 @@ class MessageAcceptTests(unittest.TestCase): user_id = UserID("us", "test") our_user = Requester(user_id, None, False, None, None) room_creator = self.homeserver.get_room_creation_handler() - room = room_creator.create_room( - our_user, room_creator.PRESETS_DICT["public_chat"], ratelimit=False + room = ensureDeferred( + room_creator.create_room( + our_user, room_creator.PRESETS_DICT["public_chat"], ratelimit=False + ) ) self.reactor.advance(0.1) self.room_id = self.successResultOf(room)["room_id"] |