summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-08-18 18:13:47 +0100
committerRichard van der Hoff <richard@matrix.org>2020-08-18 18:13:47 +0100
commitafe4c4e02e539861e36d6e080f2f5e33bd58f20d (patch)
treeabdef0313e40eec69fbd5d182cbe05fac44d11ed /tests/test_federation.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd resources.consent conditional dependency back (#8107) (diff)
downloadsynapse-afe4c4e02e539861e36d6e080f2f5e33bd58f20d.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r--tests/test_federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py

index f2fa42bfb9..4a4548433f 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py
@@ -42,7 +42,7 @@ class MessageAcceptTests(unittest.HomeserverTestCase): ) user_id = UserID("us", "test") - our_user = Requester(user_id, None, False, None, None) + our_user = Requester(user_id, None, False, False, None, None) room_creator = self.homeserver.get_room_creation_handler() room_deferred = ensureDeferred( room_creator.create_room(