diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
| commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
| tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /tests | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Merge branch 'client_server_url_rename' into develop (diff) | |
| download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz | |
Merge branch 'develop' into storage_transactions
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) |