summary refs log tree commit diff
path: root/tests/rest/test_rooms.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:29:44 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:29:44 +0100
commit8885c8546c3493ada2f00b1626d45fa90109ab5f (patch)
tree7dbe04a84413a4511bcc3ef62d227659052cefa7 /tests/rest/test_rooms.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentRespect 'limit' param in initialSync api (diff)
downloadsynapse-8885c8546c3493ada2f00b1626d45fa90109ab5f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'tests/rest/test_rooms.py')
-rw-r--r--tests/rest/test_rooms.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py

index b932ca02e0..8514d6ba21 100644 --- a/tests/rest/test_rooms.py +++ b/tests/rest/test_rooms.py
@@ -426,13 +426,13 @@ class RoomsMemberListTestCase(RestTestCase): room_id = "!aa:test" yield self.create_room_as(room_id, self.user_id) (code, response) = yield self.mock_resource.trigger_get( - "/rooms/%s/members/list" % room_id) + "/rooms/%s/members" % room_id) self.assertEquals(200, code, msg=str(response)) @defer.inlineCallbacks def test_get_member_list_no_room(self): (code, response) = yield self.mock_resource.trigger_get( - "/rooms/roomdoesnotexist/members/list") + "/rooms/roomdoesnotexist/members") self.assertEquals(403, code, msg=str(response)) @defer.inlineCallbacks @@ -440,14 +440,14 @@ class RoomsMemberListTestCase(RestTestCase): room_id = "!bb:test" yield self.create_room_as(room_id, "@some_other_guy:red") (code, response) = yield self.mock_resource.trigger_get( - "/rooms/%s/members/list" % room_id) + "/rooms/%s/members" % room_id) self.assertEquals(403, code, msg=str(response)) @defer.inlineCallbacks def test_get_member_list_mixed_memberships(self): room_id = "!bb:test" room_creator = "@some_other_guy:blue" - room_path = "/rooms/%s/members/list" % room_id + room_path = "/rooms/%s/members" % room_id yield self.create_room_as(room_id, room_creator) yield self.invite(room=room_id, src=room_creator, targ=self.user_id)