diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
| commit | d0103400b556138fca36160fd0273c0141ca94c4 (patch) | |
| tree | 0a66e58777d171743b72cf0e93240f747c6a5825 /tests | |
| parent | Use state_key rather than target_user_id (diff) | |
| parent | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff) | |
| download | synapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz | |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/test_rooms.py | 8 |
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) |