mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-12-10 04:52:06 -05:00
Remove spurious "SynapseRequest" result from `make_request"
This was never used, so let's get rid of it.
This commit is contained in:
Richard van der Hoff
parent
ac2acf1524
commit
394516ad1b
59 changed files with 742 additions and 983 deletions
|
|
@ -84,13 +84,13 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
self.created_rmid_msg_path = (
|
||||
"rooms/%s/send/m.room.message/a1" % (self.created_rmid)
|
||||
).encode("ascii")
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", self.created_rmid_msg_path, b'{"msgtype":"m.text","body":"test msg"}'
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.result)
|
||||
|
||||
# set topic for public room
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
("rooms/%s/state/m.room.topic" % self.created_public_rmid).encode("ascii"),
|
||||
b'{"topic":"Public Room Topic"}',
|
||||
|
|
@ -112,7 +112,7 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
)
|
||||
|
||||
# send message in uncreated room, expect 403
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/rooms/%s/send/m.room.message/mid2" % (self.uncreated_rmid,),
|
||||
msg_content,
|
||||
|
|
@ -120,24 +120,24 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# send message in created room not joined (no state), expect 403
|
||||
request, channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# send message in created room and invited, expect 403
|
||||
self.helper.invite(
|
||||
room=self.created_rmid, src=self.rmcreator_id, targ=self.user_id
|
||||
)
|
||||
request, channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# send message in created room and joined, expect 200
|
||||
self.helper.join(room=self.created_rmid, user=self.user_id)
|
||||
request, channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
# send message in created room and left, expect 403
|
||||
self.helper.leave(room=self.created_rmid, user=self.user_id)
|
||||
request, channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
channel = self.make_request("PUT", send_msg_path(), msg_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_topic_perms(self):
|
||||
|
|
@ -145,30 +145,30 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
topic_path = "/rooms/%s/state/m.room.topic" % self.created_rmid
|
||||
|
||||
# set/get topic in uncreated room, expect 403
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", "/rooms/%s/state/m.room.topic" % self.uncreated_rmid, topic_content
|
||||
)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/rooms/%s/state/m.room.topic" % self.uncreated_rmid
|
||||
)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# set/get topic in created PRIVATE room not joined, expect 403
|
||||
request, channel = self.make_request("PUT", topic_path, topic_content)
|
||||
channel = self.make_request("PUT", topic_path, topic_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
request, channel = self.make_request("GET", topic_path)
|
||||
channel = self.make_request("GET", topic_path)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# set topic in created PRIVATE room and invited, expect 403
|
||||
self.helper.invite(
|
||||
room=self.created_rmid, src=self.rmcreator_id, targ=self.user_id
|
||||
)
|
||||
request, channel = self.make_request("PUT", topic_path, topic_content)
|
||||
channel = self.make_request("PUT", topic_path, topic_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# get topic in created PRIVATE room and invited, expect 403
|
||||
request, channel = self.make_request("GET", topic_path)
|
||||
channel = self.make_request("GET", topic_path)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# set/get topic in created PRIVATE room and joined, expect 200
|
||||
|
|
@ -176,29 +176,29 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
|
||||
# Only room ops can set topic by default
|
||||
self.helper.auth_user_id = self.rmcreator_id
|
||||
request, channel = self.make_request("PUT", topic_path, topic_content)
|
||||
channel = self.make_request("PUT", topic_path, topic_content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.helper.auth_user_id = self.user_id
|
||||
|
||||
request, channel = self.make_request("GET", topic_path)
|
||||
channel = self.make_request("GET", topic_path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.assert_dict(json.loads(topic_content.decode("utf8")), channel.json_body)
|
||||
|
||||
# set/get topic in created PRIVATE room and left, expect 403
|
||||
self.helper.leave(room=self.created_rmid, user=self.user_id)
|
||||
request, channel = self.make_request("PUT", topic_path, topic_content)
|
||||
channel = self.make_request("PUT", topic_path, topic_content)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
request, channel = self.make_request("GET", topic_path)
|
||||
channel = self.make_request("GET", topic_path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
# get topic in PUBLIC room, not joined, expect 403
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/rooms/%s/state/m.room.topic" % self.created_public_rmid
|
||||
)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
# set topic in PUBLIC room, not joined, expect 403
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/rooms/%s/state/m.room.topic" % self.created_public_rmid,
|
||||
topic_content,
|
||||
|
|
@ -208,7 +208,7 @@ class RoomPermissionsTestCase(RoomBase):
|
|||
def _test_get_membership(self, room=None, members=[], expect_code=None):
|
||||
for member in members:
|
||||
path = "/rooms/%s/state/m.room.member/%s" % (room, member)
|
||||
request, channel = self.make_request("GET", path)
|
||||
channel = self.make_request("GET", path)
|
||||
self.assertEquals(expect_code, channel.code)
|
||||
|
||||
def test_membership_basic_room_perms(self):
|
||||
|
|
@ -380,16 +380,16 @@ class RoomsMemberListTestCase(RoomBase):
|
|||
|
||||
def test_get_member_list(self):
|
||||
room_id = self.helper.create_room_as(self.user_id)
|
||||
request, channel = self.make_request("GET", "/rooms/%s/members" % room_id)
|
||||
channel = self.make_request("GET", "/rooms/%s/members" % room_id)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_get_member_list_no_room(self):
|
||||
request, channel = self.make_request("GET", "/rooms/roomdoesnotexist/members")
|
||||
channel = self.make_request("GET", "/rooms/roomdoesnotexist/members")
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_get_member_list_no_permission(self):
|
||||
room_id = self.helper.create_room_as("@some_other_guy:red")
|
||||
request, channel = self.make_request("GET", "/rooms/%s/members" % room_id)
|
||||
channel = self.make_request("GET", "/rooms/%s/members" % room_id)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_get_member_list_mixed_memberships(self):
|
||||
|
|
@ -398,17 +398,17 @@ class RoomsMemberListTestCase(RoomBase):
|
|||
room_path = "/rooms/%s/members" % room_id
|
||||
self.helper.invite(room=room_id, src=room_creator, targ=self.user_id)
|
||||
# can't see list if you're just invited.
|
||||
request, channel = self.make_request("GET", room_path)
|
||||
channel = self.make_request("GET", room_path)
|
||||
self.assertEquals(403, channel.code, msg=channel.result["body"])
|
||||
|
||||
self.helper.join(room=room_id, user=self.user_id)
|
||||
# can see list now joined
|
||||
request, channel = self.make_request("GET", room_path)
|
||||
channel = self.make_request("GET", room_path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
self.helper.leave(room=room_id, user=self.user_id)
|
||||
# can see old list once left
|
||||
request, channel = self.make_request("GET", room_path)
|
||||
channel = self.make_request("GET", room_path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
|
||||
|
|
@ -419,30 +419,26 @@ class RoomsCreateTestCase(RoomBase):
|
|||
|
||||
def test_post_room_no_keys(self):
|
||||
# POST with no config keys, expect new room id
|
||||
request, channel = self.make_request("POST", "/createRoom", "{}")
|
||||
channel = self.make_request("POST", "/createRoom", "{}")
|
||||
|
||||
self.assertEquals(200, channel.code, channel.result)
|
||||
self.assertTrue("room_id" in channel.json_body)
|
||||
|
||||
def test_post_room_visibility_key(self):
|
||||
# POST with visibility config key, expect new room id
|
||||
request, channel = self.make_request(
|
||||
"POST", "/createRoom", b'{"visibility":"private"}'
|
||||
)
|
||||
channel = self.make_request("POST", "/createRoom", b'{"visibility":"private"}')
|
||||
self.assertEquals(200, channel.code)
|
||||
self.assertTrue("room_id" in channel.json_body)
|
||||
|
||||
def test_post_room_custom_key(self):
|
||||
# POST with custom config keys, expect new room id
|
||||
request, channel = self.make_request(
|
||||
"POST", "/createRoom", b'{"custom":"stuff"}'
|
||||
)
|
||||
channel = self.make_request("POST", "/createRoom", b'{"custom":"stuff"}')
|
||||
self.assertEquals(200, channel.code)
|
||||
self.assertTrue("room_id" in channel.json_body)
|
||||
|
||||
def test_post_room_known_and_unknown_keys(self):
|
||||
# POST with custom + known config keys, expect new room id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "/createRoom", b'{"visibility":"private","custom":"things"}'
|
||||
)
|
||||
self.assertEquals(200, channel.code)
|
||||
|
|
@ -450,16 +446,16 @@ class RoomsCreateTestCase(RoomBase):
|
|||
|
||||
def test_post_room_invalid_content(self):
|
||||
# POST with invalid content / paths, expect 400
|
||||
request, channel = self.make_request("POST", "/createRoom", b'{"visibili')
|
||||
channel = self.make_request("POST", "/createRoom", b'{"visibili')
|
||||
self.assertEquals(400, channel.code)
|
||||
|
||||
request, channel = self.make_request("POST", "/createRoom", b'["hello"]')
|
||||
channel = self.make_request("POST", "/createRoom", b'["hello"]')
|
||||
self.assertEquals(400, channel.code)
|
||||
|
||||
def test_post_room_invitees_invalid_mxid(self):
|
||||
# POST with invalid invitee, see https://github.com/matrix-org/synapse/issues/4088
|
||||
# Note the trailing space in the MXID here!
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "/createRoom", b'{"invite":["@alice:example.com "]}'
|
||||
)
|
||||
self.assertEquals(400, channel.code)
|
||||
|
|
@ -477,54 +473,54 @@ class RoomTopicTestCase(RoomBase):
|
|||
|
||||
def test_invalid_puts(self):
|
||||
# missing keys or invalid json
|
||||
request, channel = self.make_request("PUT", self.path, "{}")
|
||||
channel = self.make_request("PUT", self.path, "{}")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", self.path, '{"_name":"bo"}')
|
||||
channel = self.make_request("PUT", self.path, '{"_name":"bo"}')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", self.path, '{"nao')
|
||||
channel = self.make_request("PUT", self.path, '{"nao')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", self.path, '[{"_name":"bo"},{"_name":"jill"}]'
|
||||
)
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", self.path, "text only")
|
||||
channel = self.make_request("PUT", self.path, "text only")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", self.path, "")
|
||||
channel = self.make_request("PUT", self.path, "")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
# valid key, wrong type
|
||||
content = '{"topic":["Topic name"]}'
|
||||
request, channel = self.make_request("PUT", self.path, content)
|
||||
channel = self.make_request("PUT", self.path, content)
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_rooms_topic(self):
|
||||
# nothing should be there
|
||||
request, channel = self.make_request("GET", self.path)
|
||||
channel = self.make_request("GET", self.path)
|
||||
self.assertEquals(404, channel.code, msg=channel.result["body"])
|
||||
|
||||
# valid put
|
||||
content = '{"topic":"Topic name"}'
|
||||
request, channel = self.make_request("PUT", self.path, content)
|
||||
channel = self.make_request("PUT", self.path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
# valid get
|
||||
request, channel = self.make_request("GET", self.path)
|
||||
channel = self.make_request("GET", self.path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.assert_dict(json.loads(content), channel.json_body)
|
||||
|
||||
def test_rooms_topic_with_extra_keys(self):
|
||||
# valid put with extra keys
|
||||
content = '{"topic":"Seasons","subtopic":"Summer"}'
|
||||
request, channel = self.make_request("PUT", self.path, content)
|
||||
channel = self.make_request("PUT", self.path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
# valid get
|
||||
request, channel = self.make_request("GET", self.path)
|
||||
channel = self.make_request("GET", self.path)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.assert_dict(json.loads(content), channel.json_body)
|
||||
|
||||
|
|
@ -540,24 +536,22 @@ class RoomMemberStateTestCase(RoomBase):
|
|||
def test_invalid_puts(self):
|
||||
path = "/rooms/%s/state/m.room.member/%s" % (self.room_id, self.user_id)
|
||||
# missing keys or invalid json
|
||||
request, channel = self.make_request("PUT", path, "{}")
|
||||
channel = self.make_request("PUT", path, "{}")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, '{"_name":"bo"}')
|
||||
channel = self.make_request("PUT", path, '{"_name":"bo"}')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, '{"nao')
|
||||
channel = self.make_request("PUT", path, '{"nao')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", path, b'[{"_name":"bo"},{"_name":"jill"}]'
|
||||
)
|
||||
channel = self.make_request("PUT", path, b'[{"_name":"bo"},{"_name":"jill"}]')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, "text only")
|
||||
channel = self.make_request("PUT", path, "text only")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, "")
|
||||
channel = self.make_request("PUT", path, "")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
# valid keys, wrong types
|
||||
|
|
@ -566,7 +560,7 @@ class RoomMemberStateTestCase(RoomBase):
|
|||
Membership.JOIN,
|
||||
Membership.LEAVE,
|
||||
)
|
||||
request, channel = self.make_request("PUT", path, content.encode("ascii"))
|
||||
channel = self.make_request("PUT", path, content.encode("ascii"))
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_rooms_members_self(self):
|
||||
|
|
@ -577,10 +571,10 @@ class RoomMemberStateTestCase(RoomBase):
|
|||
|
||||
# valid join message (NOOP since we made the room)
|
||||
content = '{"membership":"%s"}' % Membership.JOIN
|
||||
request, channel = self.make_request("PUT", path, content.encode("ascii"))
|
||||
channel = self.make_request("PUT", path, content.encode("ascii"))
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("GET", path, None)
|
||||
channel = self.make_request("GET", path, None)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
expected_response = {"membership": Membership.JOIN}
|
||||
|
|
@ -595,10 +589,10 @@ class RoomMemberStateTestCase(RoomBase):
|
|||
|
||||
# valid invite message
|
||||
content = '{"membership":"%s"}' % Membership.INVITE
|
||||
request, channel = self.make_request("PUT", path, content)
|
||||
channel = self.make_request("PUT", path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("GET", path, None)
|
||||
channel = self.make_request("GET", path, None)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.assertEquals(json.loads(content), channel.json_body)
|
||||
|
||||
|
|
@ -614,10 +608,10 @@ class RoomMemberStateTestCase(RoomBase):
|
|||
Membership.INVITE,
|
||||
"Join us!",
|
||||
)
|
||||
request, channel = self.make_request("PUT", path, content)
|
||||
channel = self.make_request("PUT", path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("GET", path, None)
|
||||
channel = self.make_request("GET", path, None)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
self.assertEquals(json.loads(content), channel.json_body)
|
||||
|
||||
|
|
@ -668,7 +662,7 @@ class RoomJoinRatelimitTestCase(RoomBase):
|
|||
|
||||
# Update the display name for the user.
|
||||
path = "/_matrix/client/r0/profile/%s/displayname" % self.user_id
|
||||
request, channel = self.make_request("PUT", path, {"displayname": "John Doe"})
|
||||
channel = self.make_request("PUT", path, {"displayname": "John Doe"})
|
||||
self.assertEquals(channel.code, 200, channel.json_body)
|
||||
|
||||
# Check that all the rooms have been sent a profile update into.
|
||||
|
|
@ -678,7 +672,7 @@ class RoomJoinRatelimitTestCase(RoomBase):
|
|||
self.user_id,
|
||||
)
|
||||
|
||||
request, channel = self.make_request("GET", path)
|
||||
channel = self.make_request("GET", path)
|
||||
self.assertEquals(channel.code, 200)
|
||||
|
||||
self.assertIn("displayname", channel.json_body)
|
||||
|
|
@ -702,7 +696,7 @@ class RoomJoinRatelimitTestCase(RoomBase):
|
|||
# Make sure we send more requests than the rate-limiting config would allow
|
||||
# if all of these requests ended up joining the user to a room.
|
||||
for i in range(4):
|
||||
request, channel = self.make_request("POST", path % room_id, {})
|
||||
channel = self.make_request("POST", path % room_id, {})
|
||||
self.assertEquals(channel.code, 200)
|
||||
|
||||
@unittest.override_config(
|
||||
|
|
@ -731,42 +725,40 @@ class RoomMessagesTestCase(RoomBase):
|
|||
def test_invalid_puts(self):
|
||||
path = "/rooms/%s/send/m.room.message/mid1" % (urlparse.quote(self.room_id))
|
||||
# missing keys or invalid json
|
||||
request, channel = self.make_request("PUT", path, b"{}")
|
||||
channel = self.make_request("PUT", path, b"{}")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, b'{"_name":"bo"}')
|
||||
channel = self.make_request("PUT", path, b'{"_name":"bo"}')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, b'{"nao')
|
||||
channel = self.make_request("PUT", path, b'{"nao')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", path, b'[{"_name":"bo"},{"_name":"jill"}]'
|
||||
)
|
||||
channel = self.make_request("PUT", path, b'[{"_name":"bo"},{"_name":"jill"}]')
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, b"text only")
|
||||
channel = self.make_request("PUT", path, b"text only")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
request, channel = self.make_request("PUT", path, b"")
|
||||
channel = self.make_request("PUT", path, b"")
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
def test_rooms_messages_sent(self):
|
||||
path = "/rooms/%s/send/m.room.message/mid1" % (urlparse.quote(self.room_id))
|
||||
|
||||
content = b'{"body":"test","msgtype":{"type":"a"}}'
|
||||
request, channel = self.make_request("PUT", path, content)
|
||||
channel = self.make_request("PUT", path, content)
|
||||
self.assertEquals(400, channel.code, msg=channel.result["body"])
|
||||
|
||||
# custom message types
|
||||
content = b'{"body":"test","msgtype":"test.custom.text"}'
|
||||
request, channel = self.make_request("PUT", path, content)
|
||||
channel = self.make_request("PUT", path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
# m.text message type
|
||||
path = "/rooms/%s/send/m.room.message/mid2" % (urlparse.quote(self.room_id))
|
||||
content = b'{"body":"test2","msgtype":"m.text"}'
|
||||
request, channel = self.make_request("PUT", path, content)
|
||||
channel = self.make_request("PUT", path, content)
|
||||
self.assertEquals(200, channel.code, msg=channel.result["body"])
|
||||
|
||||
|
||||
|
|
@ -780,9 +772,7 @@ class RoomInitialSyncTestCase(RoomBase):
|
|||
self.room_id = self.helper.create_room_as(self.user_id)
|
||||
|
||||
def test_initial_sync(self):
|
||||
request, channel = self.make_request(
|
||||
"GET", "/rooms/%s/initialSync" % self.room_id
|
||||
)
|
||||
channel = self.make_request("GET", "/rooms/%s/initialSync" % self.room_id)
|
||||
self.assertEquals(200, channel.code)
|
||||
|
||||
self.assertEquals(self.room_id, channel.json_body["room_id"])
|
||||
|
|
@ -823,7 +813,7 @@ class RoomMessageListTestCase(RoomBase):
|
|||
|
||||
def test_topo_token_is_accepted(self):
|
||||
token = "t1-0_0_0_0_0_0_0_0_0"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)
|
||||
)
|
||||
self.assertEquals(200, channel.code)
|
||||
|
|
@ -834,7 +824,7 @@ class RoomMessageListTestCase(RoomBase):
|
|||
|
||||
def test_stream_token_is_accepted_for_fwd_pagianation(self):
|
||||
token = "s0_0_0_0_0_0_0_0_0"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)
|
||||
)
|
||||
self.assertEquals(200, channel.code)
|
||||
|
|
@ -867,7 +857,7 @@ class RoomMessageListTestCase(RoomBase):
|
|||
self.helper.send(self.room_id, "message 3")
|
||||
|
||||
# Check that we get the first and second message when querying /messages.
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=x&from=%s&dir=b&filter=%s"
|
||||
% (
|
||||
|
|
@ -895,7 +885,7 @@ class RoomMessageListTestCase(RoomBase):
|
|||
|
||||
# Check that we only get the second message through /message now that the first
|
||||
# has been purged.
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=x&from=%s&dir=b&filter=%s"
|
||||
% (
|
||||
|
|
@ -912,7 +902,7 @@ class RoomMessageListTestCase(RoomBase):
|
|||
# Check that we get no event, but also no error, when querying /messages with
|
||||
# the token that was pointing at the first event, because we don't have it
|
||||
# anymore.
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=x&from=%s&dir=b&filter=%s"
|
||||
% (
|
||||
|
|
@ -971,7 +961,7 @@ class RoomSearchTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.send(self.room, body="Hi!", tok=self.other_access_token)
|
||||
self.helper.send(self.room, body="There!", tok=self.other_access_token)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/search?access_token=%s" % (self.access_token,),
|
||||
{
|
||||
|
|
@ -1000,7 +990,7 @@ class RoomSearchTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.send(self.room, body="Hi!", tok=self.other_access_token)
|
||||
self.helper.send(self.room, body="There!", tok=self.other_access_token)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/search?access_token=%s" % (self.access_token,),
|
||||
{
|
||||
|
|
@ -1048,14 +1038,14 @@ class PublicRoomsRestrictedTestCase(unittest.HomeserverTestCase):
|
|||
return self.hs
|
||||
|
||||
def test_restricted_no_auth(self):
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
self.assertEqual(channel.code, 401, channel.result)
|
||||
|
||||
def test_restricted_auth(self):
|
||||
self.register_user("user", "pass")
|
||||
tok = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request("GET", self.url, access_token=tok)
|
||||
channel = self.make_request("GET", self.url, access_token=tok)
|
||||
self.assertEqual(channel.code, 200, channel.result)
|
||||
|
||||
|
||||
|
|
@ -1083,7 +1073,7 @@ class PerRoomProfilesForbiddenTestCase(unittest.HomeserverTestCase):
|
|||
self.displayname = "test user"
|
||||
data = {"displayname": self.displayname}
|
||||
request_data = json.dumps(data)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/_matrix/client/r0/profile/%s/displayname" % (self.user_id,),
|
||||
request_data,
|
||||
|
|
@ -1096,7 +1086,7 @@ class PerRoomProfilesForbiddenTestCase(unittest.HomeserverTestCase):
|
|||
def test_per_room_profile_forbidden(self):
|
||||
data = {"membership": "join", "displayname": "other test user"}
|
||||
request_data = json.dumps(data)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/_matrix/client/r0/rooms/%s/state/m.room.member/%s"
|
||||
% (self.room_id, self.user_id),
|
||||
|
|
@ -1106,7 +1096,7 @@ class PerRoomProfilesForbiddenTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(channel.code, 200, channel.result)
|
||||
event_id = channel.json_body["event_id"]
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_matrix/client/r0/rooms/%s/event/%s" % (self.room_id, event_id),
|
||||
access_token=self.tok,
|
||||
|
|
@ -1139,7 +1129,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def test_join_reason(self):
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/join".format(self.room_id),
|
||||
content={"reason": reason},
|
||||
|
|
@ -1153,7 +1143,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.join(self.room_id, user=self.second_user_id, tok=self.second_tok)
|
||||
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/leave".format(self.room_id),
|
||||
content={"reason": reason},
|
||||
|
|
@ -1167,7 +1157,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.join(self.room_id, user=self.second_user_id, tok=self.second_tok)
|
||||
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/kick".format(self.room_id),
|
||||
content={"reason": reason, "user_id": self.second_user_id},
|
||||
|
|
@ -1181,7 +1171,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.join(self.room_id, user=self.second_user_id, tok=self.second_tok)
|
||||
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/ban".format(self.room_id),
|
||||
content={"reason": reason, "user_id": self.second_user_id},
|
||||
|
|
@ -1193,7 +1183,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def test_unban_reason(self):
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/unban".format(self.room_id),
|
||||
content={"reason": reason, "user_id": self.second_user_id},
|
||||
|
|
@ -1205,7 +1195,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def test_invite_reason(self):
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/invite".format(self.room_id),
|
||||
content={"reason": reason, "user_id": self.second_user_id},
|
||||
|
|
@ -1224,7 +1214,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
reason = "hello"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/_matrix/client/r0/rooms/{}/leave".format(self.room_id),
|
||||
content={"reason": reason},
|
||||
|
|
@ -1235,7 +1225,7 @@ class RoomMembershipReasonTestCase(unittest.HomeserverTestCase):
|
|||
self._check_for_reason(reason)
|
||||
|
||||
def _check_for_reason(self, reason):
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_matrix/client/r0/rooms/{}/state/m.room.member/{}".format(
|
||||
self.room_id, self.second_user_id
|
||||
|
|
@ -1284,7 +1274,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
"""Test that we can filter by a label on a /context request."""
|
||||
event_id = self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/context/%s?filter=%s"
|
||||
% (self.room_id, event_id, json.dumps(self.FILTER_LABELS)),
|
||||
|
|
@ -1314,7 +1304,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
"""Test that we can filter by the absence of a label on a /context request."""
|
||||
event_id = self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/context/%s?filter=%s"
|
||||
% (self.room_id, event_id, json.dumps(self.FILTER_NOT_LABELS)),
|
||||
|
|
@ -1349,7 +1339,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
event_id = self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/context/%s?filter=%s"
|
||||
% (self.room_id, event_id, json.dumps(self.FILTER_LABELS_NOT_LABELS)),
|
||||
|
|
@ -1377,7 +1367,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
self._send_labelled_messages_in_room()
|
||||
|
||||
token = "s0_0_0_0_0_0_0_0_0"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=%s&from=%s&filter=%s"
|
||||
% (self.room_id, self.tok, token, json.dumps(self.FILTER_LABELS)),
|
||||
|
|
@ -1394,7 +1384,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
self._send_labelled_messages_in_room()
|
||||
|
||||
token = "s0_0_0_0_0_0_0_0_0"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=%s&from=%s&filter=%s"
|
||||
% (self.room_id, self.tok, token, json.dumps(self.FILTER_NOT_LABELS)),
|
||||
|
|
@ -1417,7 +1407,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
self._send_labelled_messages_in_room()
|
||||
|
||||
token = "s0_0_0_0_0_0_0_0_0"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/messages?access_token=%s&from=%s&filter=%s"
|
||||
% (
|
||||
|
|
@ -1448,7 +1438,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "/search?access_token=%s" % self.tok, request_data
|
||||
)
|
||||
|
||||
|
|
@ -1483,7 +1473,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "/search?access_token=%s" % self.tok, request_data
|
||||
)
|
||||
|
||||
|
|
@ -1530,7 +1520,7 @@ class LabelsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self._send_labelled_messages_in_room()
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "/search?access_token=%s" % self.tok, request_data
|
||||
)
|
||||
|
||||
|
|
@ -1651,7 +1641,7 @@ class ContextTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Check that we can still see the messages before the erasure request.
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
'/rooms/%s/context/%s?filter={"types":["m.room.message"]}'
|
||||
% (self.room_id, event_id),
|
||||
|
|
@ -1715,7 +1705,7 @@ class ContextTestCase(unittest.HomeserverTestCase):
|
|||
# Check that a user that joined the room after the erasure request can't see
|
||||
# the messages anymore.
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
'/rooms/%s/context/%s?filter={"types":["m.room.message"]}'
|
||||
% (self.room_id, event_id),
|
||||
|
|
@ -1805,7 +1795,7 @@ class RoomAliasListTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def _get_aliases(self, access_token: str, expected_code: int = 200) -> JsonDict:
|
||||
"""Calls the endpoint under test. returns the json response object."""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_matrix/client/unstable/org.matrix.msc2432/rooms/%s/aliases"
|
||||
% (self.room_id,),
|
||||
|
|
@ -1826,7 +1816,7 @@ class RoomAliasListTestCase(unittest.HomeserverTestCase):
|
|||
data = {"room_id": self.room_id}
|
||||
request_data = json.dumps(data)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", url, request_data, access_token=self.room_owner_tok
|
||||
)
|
||||
self.assertEqual(channel.code, expected_code, channel.result)
|
||||
|
|
@ -1856,14 +1846,14 @@ class RoomCanonicalAliasTestCase(unittest.HomeserverTestCase):
|
|||
data = {"room_id": self.room_id}
|
||||
request_data = json.dumps(data)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", url, request_data, access_token=self.room_owner_tok
|
||||
)
|
||||
self.assertEqual(channel.code, expected_code, channel.result)
|
||||
|
||||
def _get_canonical_alias(self, expected_code: int = 200) -> JsonDict:
|
||||
"""Calls the endpoint under test. returns the json response object."""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"rooms/%s/state/m.room.canonical_alias" % (self.room_id,),
|
||||
access_token=self.room_owner_tok,
|
||||
|
|
@ -1875,7 +1865,7 @@ class RoomCanonicalAliasTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def _set_canonical_alias(self, content: str, expected_code: int = 200) -> JsonDict:
|
||||
"""Calls the endpoint under test. returns the json response object."""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"rooms/%s/state/m.room.canonical_alias" % (self.room_id,),
|
||||
json.dumps(content),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue