diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
commit | bf05218c4b1740cdc5477cadbc36f0575e2dcd51 (patch) | |
tree | ced8ed09e18afb11e97734959150b8ef7f0db833 /tests/rest/test_events.py | |
parent | Fold federation/handler into handlers/federation (diff) | |
parent | Added support for GET /events/$eventid with auth checks. (diff) | |
download | synapse-bf05218c4b1740cdc5477cadbc36f0575e2dcd51.tar.xz |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'tests/rest/test_events.py')
-rw-r--r-- | tests/rest/test_events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py index cb641e0232..116acd5600 100644 --- a/tests/rest/test_events.py +++ b/tests/rest/test_events.py @@ -182,7 +182,7 @@ class EventStreamPermissionsTestCase(RestTestCase): room_id = "!rid1:test" yield self.create_room_as(room_id, self.other_user, tok=self.other_token) - yield self.send(room_id, self.other_user, tok=self.other_token) + yield self.send(room_id, tok=self.other_token) # invited to room (expect no content for room) yield self.invite(room_id, src=self.other_user, targ=self.user_id, |