Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-18 14:54:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use literals in place of HTTPStatus constants in tests (#13479)

Browse Source 
Replace
- `HTTPStatus.NOT_FOUND`
- `HTTPStatus.FORBIDDEN`
- `HTTPStatus.UNAUTHORIZED`
- `HTTPStatus.CONFLICT`
- `HTTPStatus.CREATED`

Signed-off-by: Dirk Klimpel <dirk@klimpel.org>
This commit is contained in:
Dirk Klimpel 2022-08-09 15:56:43 +02:00 committed by GitHub
parent 54fb517c28
commit 1595052b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13479.misc Normal file
View File

@ -0,0 +1 @@
Use literals in place of `HTTPStatus` constants in tests.

7
tests/rest/admin/test_admin.py
View File

@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
import urllib.parse import urllib.parse
from http import HTTPStatus
from parameterized import parameterized from parameterized import parameterized
@ -79,10 +78,10 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
# Should be quarantined # Should be quarantined
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=( msg=(
"Expected to receive a HTTPStatus.NOT_FOUND on accessing quarantined media: %s" "Expected to receive a 404 on accessing quarantined media: %s"
% server_and_media_id % server_and_media_id
), ),
) )
@ -107,7 +106,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
# Expect a forbidden error # Expect a forbidden error
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg="Expected forbidden on quarantining media as a non-admin", msg="Expected forbidden on quarantining media as a non-admin",
) )

4
tests/rest/admin/test_background_updates.py
View File

@ -51,7 +51,7 @@ class BackgroundUpdatesTestCase(unittest.HomeserverTestCase):
) )
def test_requester_is_no_admin(self, method: str, url: str) -> None: def test_requester_is_no_admin(self, method: str, url: str) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
self.register_user("user", "pass", admin=False) self.register_user("user", "pass", admin=False)
@ -64,7 +64,7 @@ class BackgroundUpdatesTestCase(unittest.HomeserverTestCase):
access_token=other_user_tok, access_token=other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_invalid_parameter(self) -> None: def test_invalid_parameter(self) -> None:

28
tests/rest/admin/test_device.py
View File

@ -58,7 +58,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
channel = self.make_request(method, self.url, b"{}") channel = self.make_request(method, self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -76,7 +76,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -85,7 +85,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
@parameterized.expand(["GET", "PUT", "DELETE"]) @parameterized.expand(["GET", "PUT", "DELETE"])
def test_user_does_not_exist(self, method: str) -> None: def test_user_does_not_exist(self, method: str) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
url = ( url = (
"/_synapse/admin/v2/users/@unknown_person:test/devices/%s" "/_synapse/admin/v2/users/@unknown_person:test/devices/%s"
@ -98,7 +98,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
@parameterized.expand(["GET", "PUT", "DELETE"]) @parameterized.expand(["GET", "PUT", "DELETE"])
@ -122,7 +122,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
def test_unknown_device(self) -> None: def test_unknown_device(self) -> None:
""" """
Tests that a lookup for a device that does not exist returns either HTTPStatus.NOT_FOUND or 200. Tests that a lookup for a device that does not exist returns either 404 or 200.
""" """
url = "/_synapse/admin/v2/users/%s/devices/unknown_device" % urllib.parse.quote( url = "/_synapse/admin/v2/users/%s/devices/unknown_device" % urllib.parse.quote(
self.other_user self.other_user
@ -134,7 +134,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
channel = self.make_request( channel = self.make_request(
@ -312,7 +312,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -331,7 +331,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -339,7 +339,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
url = "/_synapse/admin/v2/users/@unknown_person:test/devices" url = "/_synapse/admin/v2/users/@unknown_person:test/devices"
channel = self.make_request( channel = self.make_request(
@ -348,7 +348,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_user_is_not_local(self) -> None: def test_user_is_not_local(self) -> None:
@ -438,7 +438,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", self.url, b"{}") channel = self.make_request("POST", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -457,7 +457,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -465,7 +465,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
url = "/_synapse/admin/v2/users/@unknown_person:test/delete_devices" url = "/_synapse/admin/v2/users/@unknown_person:test/delete_devices"
channel = self.make_request( channel = self.make_request(
@ -474,7 +474,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_user_is_not_local(self) -> None: def test_user_is_not_local(self) -> None:

16
tests/rest/admin/test_event_reports.py
View File

@ -82,7 +82,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -90,7 +90,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
@ -100,7 +100,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -467,7 +467,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -475,7 +475,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
@ -485,7 +485,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -566,7 +566,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
def test_report_id_not_found(self) -> None: def test_report_id_not_found(self) -> None:
""" """
Testing that a not existing `report_id` returns a HTTPStatus.NOT_FOUND. Testing that a not existing `report_id` returns a 404.
""" """
channel = self.make_request( channel = self.make_request(
@ -576,7 +576,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )

10
tests/rest/admin/test_federation.py
View File

@ -64,7 +64,7 @@ class FederationTestCase(unittest.HomeserverTestCase):
access_token=other_user_tok, access_token=other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_invalid_parameter(self) -> None: def test_invalid_parameter(self) -> None:
@ -117,7 +117,7 @@ class FederationTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
# invalid destination # invalid destination
@ -127,7 +127,7 @@ class FederationTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_limit(self) -> None: def test_limit(self) -> None:
@ -561,7 +561,7 @@ class DestinationMembershipTestCase(unittest.HomeserverTestCase):
access_token=other_user_tok, access_token=other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_invalid_parameter(self) -> None: def test_invalid_parameter(self) -> None:
@ -604,7 +604,7 @@ class DestinationMembershipTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_limit(self) -> None: def test_limit(self) -> None:

32
tests/rest/admin/test_media.py
View File

@ -60,7 +60,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
channel = self.make_request("DELETE", url, b"{}") channel = self.make_request("DELETE", url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -82,7 +82,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -90,7 +90,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
def test_media_does_not_exist(self) -> None: def test_media_does_not_exist(self) -> None:
""" """
Tests that a lookup for a media that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a media that does not exist returns a 404
""" """
url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, "12345") url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, "12345")
@ -100,7 +100,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_media_is_not_local(self) -> None: def test_media_is_not_local(self) -> None:
@ -188,10 +188,10 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=( msg=(
"Expected to receive a HTTPStatus.NOT_FOUND on accessing deleted media: %s" "Expected to receive a 404 on accessing deleted media: %s"
% server_and_media_id % server_and_media_id
), ),
) )
@ -231,7 +231,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", self.url, b"{}") channel = self.make_request("POST", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -251,7 +251,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -612,10 +612,10 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
self.assertTrue(os.path.exists(local_path)) self.assertTrue(os.path.exists(local_path))
else: else:
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=( msg=(
"Expected to receive a HTTPStatus.NOT_FOUND on accessing deleted media: %s" "Expected to receive a 404 on accessing deleted media: %s"
% (server_and_media_id) % (server_and_media_id)
), ),
) )
@ -668,7 +668,7 @@ class QuarantineMediaByIDTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -689,7 +689,7 @@ class QuarantineMediaByIDTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -801,7 +801,7 @@ class ProtectMediaByIDTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", self.url % (action, self.media_id), b"{}") channel = self.make_request("POST", self.url % (action, self.media_id), b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -822,7 +822,7 @@ class ProtectMediaByIDTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -894,7 +894,7 @@ class PurgeMediaCacheTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", self.url, b"{}") channel = self.make_request("POST", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -914,7 +914,7 @@ class PurgeMediaCacheTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )

26
tests/rest/admin/test_registration_tokens.py
View File

@ -75,7 +75,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
"""Try to create a token without authentication.""" """Try to create a token without authentication."""
channel = self.make_request("POST", self.url + "/new", {}) channel = self.make_request("POST", self.url + "/new", {})
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -90,7 +90,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -390,7 +390,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
{}, {},
) )
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -405,7 +405,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -421,7 +421,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -606,7 +606,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
{}, {},
) )
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -621,7 +621,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -637,7 +637,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -667,7 +667,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
{}, {},
) )
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -682,7 +682,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -698,7 +698,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.NOT_FOUND, 404,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -729,7 +729,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
"""Try to list tokens without authentication.""" """Try to list tokens without authentication."""
channel = self.make_request("GET", self.url, {}) channel = self.make_request("GET", self.url, {})
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -744,7 +744,7 @@ class ManageRegistrationTokensTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )

40
tests/rest/admin/test_room.py
View File

@ -68,7 +68,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
@ -78,7 +78,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_room_does_not_exist(self) -> None: def test_room_does_not_exist(self) -> None:
@ -319,7 +319,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
self.room_id, self.room_id,
body="foo", body="foo",
tok=self.other_user_tok, tok=self.other_user_tok,
expect_code=HTTPStatus.FORBIDDEN, expect_code=403,
) )
# Test that room is not purged # Test that room is not purged
@ -398,7 +398,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
self._has_no_members(self.room_id) self._has_no_members(self.room_id)
# Assert we can no longer peek into the room # Assert we can no longer peek into the room
self._assert_peek(self.room_id, expect_code=HTTPStatus.FORBIDDEN) self._assert_peek(self.room_id, expect_code=403)
def _is_blocked(self, room_id: str, expect: bool = True) -> None: def _is_blocked(self, room_id: str, expect: bool = True) -> None:
"""Assert that the room is blocked or not""" """Assert that the room is blocked or not"""
@ -494,7 +494,7 @@ class DeleteRoomV2TestCase(unittest.HomeserverTestCase):
) )
def test_requester_is_no_admin(self, method: str, url: str) -> None: def test_requester_is_no_admin(self, method: str, url: str) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
@ -504,7 +504,7 @@ class DeleteRoomV2TestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_room_does_not_exist(self) -> None: def test_room_does_not_exist(self) -> None:
@ -696,7 +696,7 @@ class DeleteRoomV2TestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_delete_same_room_twice(self) -> None: def test_delete_same_room_twice(self) -> None:
@ -858,7 +858,7 @@ class DeleteRoomV2TestCase(unittest.HomeserverTestCase):
self.room_id, self.room_id,
body="foo", body="foo",
tok=self.other_user_tok, tok=self.other_user_tok,
expect_code=HTTPStatus.FORBIDDEN, expect_code=403,
) )
# Test that room is not purged # Test that room is not purged
@ -955,7 +955,7 @@ class DeleteRoomV2TestCase(unittest.HomeserverTestCase):
self._has_no_members(self.room_id) self._has_no_members(self.room_id)
# Assert we can no longer peek into the room # Assert we can no longer peek into the room
self._assert_peek(self.room_id, expect_code=HTTPStatus.FORBIDDEN) self._assert_peek(self.room_id, expect_code=403)
def _is_blocked(self, room_id: str, expect: bool = True) -> None: def _is_blocked(self, room_id: str, expect: bool = True) -> None:
"""Assert that the room is blocked or not""" """Assert that the room is blocked or not"""
@ -1782,7 +1782,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
# delete the rooms and get joined roomed membership # delete the rooms and get joined roomed membership
url = f"/_matrix/client/r0/rooms/{room_id}/joined_members" url = f"/_matrix/client/r0/rooms/{room_id}/joined_members"
channel = self.make_request("GET", url.encode("ascii"), access_token=user_tok) channel = self.make_request("GET", url.encode("ascii"), access_token=user_tok)
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
@ -1811,7 +1811,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
@ -1821,7 +1821,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
access_token=self.second_tok, access_token=self.second_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_invalid_parameter(self) -> None: def test_invalid_parameter(self) -> None:
@ -1841,7 +1841,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
def test_local_user_does_not_exist(self) -> None: def test_local_user_does_not_exist(self) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
channel = self.make_request( channel = self.make_request(
@ -1851,7 +1851,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_remote_user(self) -> None: def test_remote_user(self) -> None:
@ -1874,7 +1874,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
def test_room_does_not_exist(self) -> None: def test_room_does_not_exist(self) -> None:
""" """
Check that unknown rooms/server return error HTTPStatus.NOT_FOUND. Check that unknown rooms/server return error 404.
""" """
url = "/_synapse/admin/v1/join/!unknown:test" url = "/_synapse/admin/v1/join/!unknown:test"
@ -1885,7 +1885,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual( self.assertEqual(
"Can't join remote room because no servers that are in the room have been provided.", "Can't join remote room because no servers that are in the room have been provided.",
channel.json_body["error"], channel.json_body["error"],
@ -1952,7 +1952,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_join_private_room_if_member(self) -> None: def test_join_private_room_if_member(self) -> None:
@ -2067,7 +2067,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
% (room_id, events[midway]["event_id"]), % (room_id, events[midway]["event_id"]),
access_token=tok, access_token=tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_context_as_admin(self) -> None: def test_context_as_admin(self) -> None:
@ -2277,7 +2277,7 @@ class BlockRoomTestCase(unittest.HomeserverTestCase):
@parameterized.expand([("PUT",), ("GET",)]) @parameterized.expand([("PUT",), ("GET",)])
def test_requester_is_no_admin(self, method: str) -> None: def test_requester_is_no_admin(self, method: str) -> None:
"""If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned.""" """If the user is not a server admin, an error 403 is returned."""
channel = self.make_request( channel = self.make_request(
method, method,
@ -2286,7 +2286,7 @@ class BlockRoomTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_tok, access_token=self.other_user_tok,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
@parameterized.expand([("PUT",), ("GET",)]) @parameterized.expand([("PUT",), ("GET",)])

8
tests/rest/admin/test_server_notice.py
View File

@ -57,7 +57,7 @@ class ServerNoticeTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", self.url) channel = self.make_request("POST", self.url)
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -72,7 +72,7 @@ class ServerNoticeTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -80,7 +80,7 @@ class ServerNoticeTestCase(unittest.HomeserverTestCase):
@override_config({"server_notices": {"system_mxid_localpart": "notices"}}) @override_config({"server_notices": {"system_mxid_localpart": "notices"}})
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
"""Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND""" """Tests that a lookup for a user that does not exist returns a 404"""
channel = self.make_request( channel = self.make_request(
"POST", "POST",
self.url, self.url,
@ -88,7 +88,7 @@ class ServerNoticeTestCase(unittest.HomeserverTestCase):
content={"user_id": "@unknown_person:test", "content": ""}, content={"user_id": "@unknown_person:test", "content": ""},
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
@override_config({"server_notices": {"system_mxid_localpart": "notices"}}) @override_config({"server_notices": {"system_mxid_localpart": "notices"}})

6
tests/rest/admin/test_statistics.py
View File

@ -52,7 +52,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual( self.assertEqual(
HTTPStatus.UNAUTHORIZED, 401,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )
@ -60,7 +60,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
""" """
If the user is not a server admin, an error HTTPStatus.FORBIDDEN is returned. If the user is not a server admin, an error 403 is returned.
""" """
channel = self.make_request( channel = self.make_request(
"GET", "GET",
@ -70,7 +70,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual( self.assertEqual(
HTTPStatus.FORBIDDEN, 403,
channel.code, channel.code,
msg=channel.json_body, msg=channel.json_body,
) )

104
tests/rest/admin/test_user.py
View File

@ -142,7 +142,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
} }
channel = self.make_request("POST", self.url, body) channel = self.make_request("POST", self.url, body)
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual("HMAC incorrect", channel.json_body["error"]) self.assertEqual("HMAC incorrect", channel.json_body["error"])
def test_register_correct_nonce(self) -> None: def test_register_correct_nonce(self) -> None:
@ -375,7 +375,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
self.assertEqual("@bob3:test", channel.json_body["user_id"]) self.assertEqual("@bob3:test", channel.json_body["user_id"])
channel = self.make_request("GET", "/profile/@bob3:test/displayname") channel = self.make_request("GET", "/profile/@bob3:test/displayname")
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
# set displayname # set displayname
channel = self.make_request("GET", self.url) channel = self.make_request("GET", self.url)
@ -466,7 +466,7 @@ class UsersListTestCase(unittest.HomeserverTestCase):
""" """
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
@ -478,7 +478,7 @@ class UsersListTestCase(unittest.HomeserverTestCase):
channel = self.make_request("GET", self.url, access_token=other_user_token) channel = self.make_request("GET", self.url, access_token=other_user_token)
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_all_users(self) -> None: def test_all_users(self) -> None:
@ -941,7 +941,7 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
""" """
channel = self.make_request("POST", self.url, b"{}") channel = self.make_request("POST", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_not_admin(self) -> None: def test_requester_is_not_admin(self) -> None:
@ -952,7 +952,7 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
channel = self.make_request("POST", url, access_token=self.other_user_token) channel = self.make_request("POST", url, access_token=self.other_user_token)
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual("You are not a server admin", channel.json_body["error"]) self.assertEqual("You are not a server admin", channel.json_body["error"])
channel = self.make_request( channel = self.make_request(
@ -962,12 +962,12 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
content=b"{}", content=b"{}",
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual("You are not a server admin", channel.json_body["error"]) self.assertEqual("You are not a server admin", channel.json_body["error"])
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
""" """
Tests that deactivation for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that deactivation for a user that does not exist returns a 404
""" """
channel = self.make_request( channel = self.make_request(
@ -976,7 +976,7 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_erase_is_not_bool(self) -> None: def test_erase_is_not_bool(self) -> None:
@ -1220,7 +1220,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
access_token=self.other_user_token, access_token=self.other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual("You are not a server admin", channel.json_body["error"]) self.assertEqual("You are not a server admin", channel.json_body["error"])
channel = self.make_request( channel = self.make_request(
@ -1230,12 +1230,12 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=b"{}", content=b"{}",
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual("You are not a server admin", channel.json_body["error"]) self.assertEqual("You are not a server admin", channel.json_body["error"])
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
channel = self.make_request( channel = self.make_request(
@ -1244,7 +1244,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual("M_NOT_FOUND", channel.json_body["errcode"]) self.assertEqual("M_NOT_FOUND", channel.json_body["errcode"])
def test_invalid_parameter(self) -> None: def test_invalid_parameter(self) -> None:
@ -1379,7 +1379,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=body, content=body,
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("Bob's name", channel.json_body["displayname"]) self.assertEqual("Bob's name", channel.json_body["displayname"])
self.assertEqual("email", channel.json_body["threepids"][0]["medium"]) self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
@ -1434,7 +1434,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=body, content=body,
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("Bob's name", channel.json_body["displayname"]) self.assertEqual("Bob's name", channel.json_body["displayname"])
self.assertEqual("email", channel.json_body["threepids"][0]["medium"]) self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
@ -1512,7 +1512,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content={"password": "abc123", "admin": False}, content={"password": "abc123", "admin": False},
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertFalse(channel.json_body["admin"]) self.assertFalse(channel.json_body["admin"])
@ -1550,7 +1550,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
) )
# Admin user is not blocked by mau anymore # Admin user is not blocked by mau anymore
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertFalse(channel.json_body["admin"]) self.assertFalse(channel.json_body["admin"])
@ -1585,7 +1585,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=body, content=body,
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("email", channel.json_body["threepids"][0]["medium"]) self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"]) self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
@ -1626,7 +1626,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=body, content=body,
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("email", channel.json_body["threepids"][0]["medium"]) self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"]) self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
@ -1666,7 +1666,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content=body, content=body,
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("msisdn", channel.json_body["threepids"][0]["medium"]) self.assertEqual("msisdn", channel.json_body["threepids"][0]["medium"])
self.assertEqual("1234567890", channel.json_body["threepids"][0]["address"]) self.assertEqual("1234567890", channel.json_body["threepids"][0]["address"])
@ -2064,7 +2064,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
) )
# must fail # must fail
self.assertEqual(HTTPStatus.CONFLICT, channel.code, msg=channel.json_body) self.assertEqual(409, channel.code, msg=channel.json_body)
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"]) self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
self.assertEqual("External id is already in use.", channel.json_body["error"]) self.assertEqual("External id is already in use.", channel.json_body["error"])
@ -2261,7 +2261,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
content={"deactivated": False, "password": "foo"}, content={"deactivated": False, "password": "foo"},
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
# Reactivate the user without a password. # Reactivate the user without a password.
@ -2295,7 +2295,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
content={"deactivated": False, "password": "foo"}, content={"deactivated": False, "password": "foo"},
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
# Reactivate the user without a password. # Reactivate the user without a password.
@ -2407,7 +2407,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
content={"password": "abc123"}, content={"password": "abc123"},
) )
self.assertEqual(HTTPStatus.CREATED, channel.code, msg=channel.json_body) self.assertEqual(201, channel.code, msg=channel.json_body)
self.assertEqual("@bob:test", channel.json_body["name"]) self.assertEqual("@bob:test", channel.json_body["name"])
self.assertEqual("bob", channel.json_body["displayname"]) self.assertEqual("bob", channel.json_body["displayname"])
@ -2520,7 +2520,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
""" """
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
@ -2535,7 +2535,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
access_token=other_user_token, access_token=other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
@ -2678,7 +2678,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
""" """
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
@ -2693,12 +2693,12 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
access_token=other_user_token, access_token=other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
url = "/_synapse/admin/v1/users/@unknown_person:test/pushers" url = "/_synapse/admin/v1/users/@unknown_person:test/pushers"
channel = self.make_request( channel = self.make_request(
@ -2707,7 +2707,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_user_is_not_local(self) -> None: def test_user_is_not_local(self) -> None:
@ -2808,7 +2808,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
"""Try to list media of an user without authentication.""" """Try to list media of an user without authentication."""
channel = self.make_request(method, self.url, {}) channel = self.make_request(method, self.url, {})
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
@parameterized.expand(["GET", "DELETE"]) @parameterized.expand(["GET", "DELETE"])
@ -2822,12 +2822,12 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
access_token=other_user_token, access_token=other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
@parameterized.expand(["GET", "DELETE"]) @parameterized.expand(["GET", "DELETE"])
def test_user_does_not_exist(self, method: str) -> None: def test_user_does_not_exist(self, method: str) -> None:
"""Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND""" """Tests that a lookup for a user that does not exist returns a 404"""
url = "/_synapse/admin/v1/users/@unknown_person:test/media" url = "/_synapse/admin/v1/users/@unknown_person:test/media"
channel = self.make_request( channel = self.make_request(
method, method,
@ -2835,7 +2835,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
@parameterized.expand(["GET", "DELETE"]) @parameterized.expand(["GET", "DELETE"])
@ -3393,7 +3393,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
"""Try to login as a user without authentication.""" """Try to login as a user without authentication."""
channel = self.make_request("POST", self.url, b"{}") channel = self.make_request("POST", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_not_admin(self) -> None: def test_not_admin(self) -> None:
@ -3402,7 +3402,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
"POST", self.url, b"{}", access_token=self.other_user_tok "POST", self.url, b"{}", access_token=self.other_user_tok
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
def test_send_event(self) -> None: def test_send_event(self) -> None:
"""Test that sending event as a user works.""" """Test that sending event as a user works."""
@ -3447,7 +3447,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
# The puppet token should no longer work # The puppet token should no longer work
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token) channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
# .. but the real user's tokens should still work # .. but the real user's tokens should still work
channel = self.make_request( channel = self.make_request(
@ -3480,7 +3480,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
channel = self.make_request( channel = self.make_request(
"GET", "devices", b"{}", access_token=self.other_user_tok "GET", "devices", b"{}", access_token=self.other_user_tok
) )
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
def test_admin_logout_all(self) -> None: def test_admin_logout_all(self) -> None:
"""Tests that the admin user calling `/logout/all` does expire the """Tests that the admin user calling `/logout/all` does expire the
@ -3501,7 +3501,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
# The puppet token should no longer work # The puppet token should no longer work
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token) channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
# .. but the real user's tokens should still work # .. but the real user's tokens should still work
channel = self.make_request( channel = self.make_request(
@ -3538,7 +3538,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
room_id, room_id,
"com.example.test", "com.example.test",
tok=self.other_user_tok, tok=self.other_user_tok,
expect_code=HTTPStatus.FORBIDDEN, expect_code=403,
) )
# Login in as the user # Login in as the user
@ -3559,7 +3559,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
room_id, room_id,
user=self.other_user, user=self.other_user,
tok=self.other_user_tok, tok=self.other_user_tok,
expect_code=HTTPStatus.FORBIDDEN, expect_code=403,
) )
# Logging in as the other user and joining a room should work, even # Logging in as the other user and joining a room should work, even
@ -3594,7 +3594,7 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
Try to get information of an user without authentication. Try to get information of an user without authentication.
""" """
channel = self.make_request("GET", self.url, b"{}") channel = self.make_request("GET", self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_not_admin(self) -> None: def test_requester_is_not_admin(self) -> None:
@ -3609,7 +3609,7 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
self.url, self.url,
access_token=other_user2_token, access_token=other_user2_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_user_is_not_local(self) -> None: def test_user_is_not_local(self) -> None:
@ -3680,7 +3680,7 @@ class ShadowBanRestTestCase(unittest.HomeserverTestCase):
Try to get information of an user without authentication. Try to get information of an user without authentication.
""" """
channel = self.make_request(method, self.url) channel = self.make_request(method, self.url)
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
@parameterized.expand(["POST", "DELETE"]) @parameterized.expand(["POST", "DELETE"])
@ -3691,7 +3691,7 @@ class ShadowBanRestTestCase(unittest.HomeserverTestCase):
other_user_token = self.login("user", "pass") other_user_token = self.login("user", "pass")
channel = self.make_request(method, self.url, access_token=other_user_token) channel = self.make_request(method, self.url, access_token=other_user_token)
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
@parameterized.expand(["POST", "DELETE"]) @parameterized.expand(["POST", "DELETE"])
@ -3762,7 +3762,7 @@ class RateLimitTestCase(unittest.HomeserverTestCase):
""" """
channel = self.make_request(method, self.url, b"{}") channel = self.make_request(method, self.url, b"{}")
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
@parameterized.expand(["GET", "POST", "DELETE"]) @parameterized.expand(["GET", "POST", "DELETE"])
@ -3778,13 +3778,13 @@ class RateLimitTestCase(unittest.HomeserverTestCase):
access_token=other_user_token, access_token=other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
@parameterized.expand(["GET", "POST", "DELETE"]) @parameterized.expand(["GET", "POST", "DELETE"])
def test_user_does_not_exist(self, method: str) -> None: def test_user_does_not_exist(self, method: str) -> None:
""" """
Tests that a lookup for a user that does not exist returns a HTTPStatus.NOT_FOUND Tests that a lookup for a user that does not exist returns a 404
""" """
url = "/_synapse/admin/v1/users/@unknown_person:test/override_ratelimit" url = "/_synapse/admin/v1/users/@unknown_person:test/override_ratelimit"
@ -3794,7 +3794,7 @@ class RateLimitTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
@parameterized.expand( @parameterized.expand(
@ -3982,7 +3982,7 @@ class AccountDataTestCase(unittest.HomeserverTestCase):
"""Try to get information of a user without authentication.""" """Try to get information of a user without authentication."""
channel = self.make_request("GET", self.url, {}) channel = self.make_request("GET", self.url, {})
self.assertEqual(HTTPStatus.UNAUTHORIZED, channel.code, msg=channel.json_body) self.assertEqual(401, channel.code, msg=channel.json_body)
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"]) self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
def test_requester_is_no_admin(self) -> None: def test_requester_is_no_admin(self) -> None:
@ -3995,7 +3995,7 @@ class AccountDataTestCase(unittest.HomeserverTestCase):
access_token=other_user_token, access_token=other_user_token,
) )
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body) self.assertEqual(403, channel.code, msg=channel.json_body)
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
def test_user_does_not_exist(self) -> None: def test_user_does_not_exist(self) -> None:
@ -4008,7 +4008,7 @@ class AccountDataTestCase(unittest.HomeserverTestCase):
access_token=self.admin_user_tok, access_token=self.admin_user_tok,
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(404, channel.code, msg=channel.json_body)
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"]) self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
def test_user_is_not_local(self) -> None: def test_user_is_not_local(self) -> None: