mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-07-21 21:48:47 -04:00
Update black, and run auto formatting over the codebase (#9381)
- Update black version to the latest
- Run black auto formatting over the codebase
- Run autoformatting according to [`docs/code_style.md
`](80d6dc9783/docs/code_style.md)
- Update `code_style.md` docs around installing black to use the correct version
This commit is contained in:
Eric Eastwood
GitHub
parent
5636e597c3
commit
0a00b7ff14
271 changed files with 2802 additions and 1713 deletions
|
|
@ -70,21 +70,27 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error is returned.
|
||||
"""
|
||||
channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_token,
|
||||
"GET",
|
||||
self.url,
|
||||
access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
channel = self.make_request(
|
||||
"PUT", self.url, access_token=self.other_user_token,
|
||||
"PUT",
|
||||
self.url,
|
||||
access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
channel = self.make_request(
|
||||
"DELETE", self.url, access_token=self.other_user_token,
|
||||
"DELETE",
|
||||
self.url,
|
||||
access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -99,17 +105,29 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
% self.other_user_device_id
|
||||
)
|
||||
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"DELETE",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -123,17 +141,29 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
% self.other_user_device_id
|
||||
)
|
||||
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"DELETE",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -146,16 +176,28 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.other_user
|
||||
)
|
||||
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"DELETE",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
# Delete unknown device returns status 200
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -190,7 +232,11 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.TOO_LARGE, channel.json_body["errcode"])
|
||||
|
||||
# Ensure the display name was not updated.
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new display", channel.json_body["display_name"])
|
||||
|
|
@ -207,12 +253,20 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
)
|
||||
|
||||
channel = self.make_request("PUT", self.url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
# Ensure the display name was not updated.
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new display", channel.json_body["display_name"])
|
||||
|
|
@ -233,7 +287,11 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
# Check new display_name
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new displayname", channel.json_body["display_name"])
|
||||
|
|
@ -242,7 +300,11 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Tests that a normal lookup for a device is successfully
|
||||
"""
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
|
|
@ -264,7 +326,9 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Delete device
|
||||
channel = self.make_request(
|
||||
"DELETE", self.url, access_token=self.admin_user_tok,
|
||||
"DELETE",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -306,7 +370,11 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
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(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -316,7 +384,11 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:test/devices"
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -327,7 +399,11 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:unknown_domain/devices"
|
||||
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -339,7 +415,11 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# Get devices
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -355,7 +435,11 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
self.login("user", "pass")
|
||||
|
||||
# Get devices
|
||||
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, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(number_devices, channel.json_body["total"])
|
||||
|
|
@ -404,7 +488,11 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
channel = self.make_request("POST", self.url, access_token=other_user_token,)
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
access_token=other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -414,7 +502,11 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:test/delete_devices"
|
||||
channel = self.make_request("POST", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -425,7 +517,11 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:unknown_domain/delete_devices"
|
||||
|
||||
channel = self.make_request("POST", url, access_token=self.admin_user_tok,)
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue