mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-04 10:14:49 -04: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
|
|
@ -74,7 +74,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get an event report without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -84,9 +84,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.other_user_tok,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -96,9 +94,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(channel.json_body["total"], 20)
|
||||
|
|
@ -111,7 +107,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with limit
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -126,7 +122,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a defined starting point (from)
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -141,7 +137,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a defined starting point and limit
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5&limit=10", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -156,7 +152,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of room
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?room_id=%s" % self.room_id1,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -176,7 +172,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of user
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?user_id=%s" % self.other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -196,7 +192,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of user and room
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?user_id=%s&room_id=%s" % (self.other_user, self.room_id1),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -218,7 +214,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# fetch the most recent first, largest timestamp
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=b", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -234,7 +230,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
report += 1
|
||||
|
||||
# fetch the oldest first, smallest timestamp
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=f", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -254,7 +250,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a invalid search order returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=bar", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -267,7 +263,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative limit parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -279,7 +275,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative from parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -293,7 +289,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of results is the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=20", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -304,7 +300,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of max results is larger than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=21", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -315,7 +311,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does appear
|
||||
# Number of max results is smaller than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -327,7 +323,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
# Check
|
||||
# Set `from` to value of `next_token` for request remaining entries
|
||||
# `next_token` does not appear
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -342,7 +338,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
resp = self.helper.send(room_id, tok=user_tok)
|
||||
event_id = resp["event_id"]
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"rooms/%s/report/%s" % (room_id, event_id),
|
||||
json.dumps({"score": -100, "reason": "this makes me sad"}),
|
||||
|
|
@ -399,7 +395,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get event report without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -409,9 +405,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.other_user_tok,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -421,9 +415,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
Testing get a reported event
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self._check_fields(channel.json_body)
|
||||
|
|
@ -434,7 +426,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# `report_id` is negative
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/-123",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -448,7 +440,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# `report_id` is a non-numerical string
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/abcdef",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -462,7 +454,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# `report_id` is undefined
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -480,7 +472,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a not existing `report_id` returns a 404.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/123",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -496,7 +488,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
resp = self.helper.send(room_id, tok=user_tok)
|
||||
event_id = resp["event_id"]
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"rooms/%s/report/%s" % (room_id, event_id),
|
||||
json.dumps({"score": -100, "reason": "this makes me sad"}),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue