diff --git a/tests/federation/transport/test_knocking.py b/tests/federation/transport/test_knocking.py
index 38dc0e5aa2..5b928480e7 100644
--- a/tests/federation/transport/test_knocking.py
+++ b/tests/federation/transport/test_knocking.py
@@ -227,7 +227,7 @@ class FederationKnockingTestCase(
self.hs, room_id, user_id
)
- _, channel = self.make_request(
+ channel = self.make_request(
"GET",
"/_matrix/federation/unstable/%s/make_knock/%s/%s?ver=%s"
% (
@@ -271,7 +271,7 @@ class FederationKnockingTestCase(
)
# Send the signed knock event into the room
- _, channel = self.make_request(
+ channel = self.make_request(
"PUT",
"/_matrix/federation/unstable/%s/send_knock/%s/%s"
% (KNOCK_UNSTABLE_IDENTIFIER, room_id, signed_knock_event.event_id),
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index 9c39b140a1..aaf5b92f41 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -18,7 +18,6 @@ from mock import Mock
from synapse.api.auth import Auth
from synapse.api.constants import UserTypes
from synapse.api.errors import Codes, ResourceLimitError, SynapseError
-from synapse.http.site import SynapseRequest
from synapse.rest.client.v2_alpha.register import (
_map_email_to_displayname,
register_servlets,
@@ -619,11 +618,9 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
def uia_register(self, expected_response: int, body: dict) -> FakeChannel:
"""Make a register request."""
- request, channel = self.make_request(
- "POST", "register", body
- ) # type: SynapseRequest, FakeChannel
+ channel = self.make_request("POST", "register", body)
- self.assertEqual(request.code, expected_response)
+ self.assertEqual(channel.code, expected_response)
return channel
async def get_or_create_user(
diff --git a/tests/handlers/test_user_directory.py b/tests/handlers/test_user_directory.py
index dc433e1487..9a49e7983e 100644
--- a/tests/handlers/test_user_directory.py
+++ b/tests/handlers/test_user_directory.py
@@ -672,7 +672,7 @@ class UserInfoTestCase(unittest.FederatingHomeserverTestCase):
user_one, user_two, user_three, user_three_token = self.setup_test_users()
# Request info about each user from user_three
- request, channel = self.make_request(
+ channel = self.make_request(
"POST",
path="/_matrix/client/unstable/users/info",
content={"user_ids": [user_one, user_two, user_three]},
@@ -703,7 +703,7 @@ class UserInfoTestCase(unittest.FederatingHomeserverTestCase):
user_one, user_two, user_three, user_three_token = self.setup_test_users()
# Request information about our local users from the perspective of a remote server
- request, channel = self.make_request(
+ channel = self.make_request(
"POST",
path="/_matrix/federation/unstable/users/info",
content={"user_ids": [user_one, user_two, user_three]},
@@ -756,9 +756,7 @@ class UserInfoTestCase(unittest.FederatingHomeserverTestCase):
"expiration_ts": 0,
"enable_renewal_emails": False,
}
- request, channel = self.make_request(
- "POST", url, request_data, access_token=admin_tok
- )
+ channel = self.make_request("POST", url, request_data, access_token=admin_tok)
self.assertEquals(channel.result["code"], b"200", channel.result)
def deactivate(self, user_id, tok):
@@ -766,7 +764,7 @@ class UserInfoTestCase(unittest.FederatingHomeserverTestCase):
"auth": {"type": "m.login.password", "user": user_id, "password": "pass"},
"erase": False,
}
- request, channel = self.make_request(
+ channel = self.make_request(
"POST", "account/deactivate", request_data, access_token=tok
)
- self.assertEqual(request.code, 200)
+ self.assertEqual(channel.code, 200)
diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py
index 3fdb78d63d..61bdae0879 100644
--- a/tests/rest/client/test_identity.py
+++ b/tests/rest/client/test_identity.py
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import json
-
from mock import Mock
from twisted.internet import defer
@@ -50,22 +48,17 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase):
self.tok = self.login("kermit", "monkey")
def test_3pid_invite_disabled(self):
- request, channel = self.make_request(
- b"POST", "/createRoom", b"{}", access_token=self.tok
- )
+ channel = self.make_request(b"POST", "/createRoom", {}, access_token=self.tok)
self.assertEquals(channel.result["code"], b"200", channel.result)
room_id = channel.json_body["room_id"]
- params = {
+ data = {
"id_server": "testis",
"medium": "email",
"address": "test@example.com",
}
- request_data = json.dumps(params)
request_url = ("/rooms/%s/invite" % (room_id)).encode("ascii")
- request, channel = self.make_request(
- b"POST", request_url, request_data, access_token=self.tok
- )
+ channel = self.make_request(b"POST", request_url, data, access_token=self.tok)
self.assertEquals(channel.result["code"], b"403", channel.result)
def test_3pid_lookup_disabled(self):
@@ -73,7 +66,7 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase):
"/_matrix/client/unstable/account/3pid/lookup"
"?id_server=testis&medium=email&address=foo@bar.baz"
)
- request, channel = self.make_request("GET", url, access_token=self.tok)
+ channel = self.make_request("GET", url, access_token=self.tok)
self.assertEqual(channel.result["code"], b"403", channel.result)
def test_3pid_bulk_lookup_disabled(self):
@@ -82,10 +75,7 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase):
"id_server": "testis",
"threepids": [["email", "foo@bar.baz"], ["email", "john.doe@matrix.org"]],
}
- request_data = json.dumps(data)
- request, channel = self.make_request(
- "POST", url, request_data, access_token=self.tok
- )
+ channel = self.make_request("POST", url, data, access_token=self.tok)
self.assertEqual(channel.result["code"], b"403", channel.result)
@@ -125,20 +115,19 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase):
self.tok = self.login("kermit", "monkey")
def test_3pid_invite_enabled(self):
- channel = self.make_request(b"POST", "/createRoom", b"{}", access_token=self.tok)
+ channel = self.make_request(
+ b"POST", "/createRoom", b"{}", access_token=self.tok
+ )
self.assertEquals(channel.result["code"], b"200", channel.result)
room_id = channel.json_body["room_id"]
- params = {
+ data = {
"id_server": "testis",
"medium": "email",
"address": "test@example.com",
}
- request_data = json.dumps(params)
request_url = ("/rooms/%s/invite" % (room_id)).encode("ascii")
- channel = self.make_request(
- b"POST", request_url, request_data, access_token=self.tok
- )
+ channel = self.make_request(b"POST", request_url, data, access_token=self.tok)
get_json = self.hs.get_identity_handler().http_client.get_json
get_json.assert_called_once_with(
@@ -166,8 +155,7 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase):
"id_server": "testis",
"threepids": [["email", "foo@bar.baz"], ["email", "john.doe@matrix.org"]],
}
- request_data = json.dumps(data)
- self.make_request("POST", url, request_data, access_token=self.tok)
+ self.make_request("POST", url, data, access_token=self.tok)
post_json = self.hs.get_simple_http_client().post_json_get_json
post_json.assert_called_once_with(
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py
index 89016b82ce..97f379b5a5 100644
--- a/tests/rest/client/test_room_access_rules.py
+++ b/tests/rest/client/test_room_access_rules.py
@@ -273,7 +273,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
)
# List preset_room_id in the public room list
- request, channel = self.make_request(
+ channel = self.make_request(
"PUT",
"/_matrix/client/r0/directory/list/room/%s" % (preset_room_id,),
{"visibility": "public"},
@@ -282,7 +282,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
self.assertEqual(channel.code, 200, channel.result)
# List init_state_room_id in the public room list
- request, channel = self.make_request(
+ channel = self.make_request(
"PUT",
"/_matrix/client/r0/directory/list/room/%s" % (init_state_room_id,),
{"visibility": "public"},
@@ -361,14 +361,14 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
url = "/_matrix/client/r0/directory/list/room/%s" % self.restricted_room
data = {"visibility": "public"}
- request, channel = self.make_request("PUT", url, data, access_token=self.tok)
+ channel = self.make_request("PUT", url, data, access_token=self.tok)
self.assertEqual(channel.code, 200, channel.result)
# We are allowed to remove the room from the public room list
url = "/_matrix/client/r0/directory/list/room/%s" % self.restricted_room
data = {"visibility": "private"}
- request, channel = self.make_request("PUT", url, data, access_token=self.tok)
+ channel = self.make_request("PUT", url, data, access_token=self.tok)
self.assertEqual(channel.code, 200, channel.result)
def test_direct(self):
@@ -470,7 +470,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
url = "/_matrix/client/r0/directory/list/room/%s" % self.direct_rooms[0]
data = {"visibility": "public"}
- request, channel = self.make_request("PUT", url, data, access_token=self.tok)
+ channel = self.make_request("PUT", url, data, access_token=self.tok)
self.assertEqual(channel.code, 403, channel.result)
def test_unrestricted(self):
@@ -549,7 +549,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
url = "/_matrix/client/r0/directory/list/room/%s" % self.unrestricted_room
data = {"visibility": "public"}
- request, channel = self.make_request("PUT", url, data, access_token=self.tok)
+ channel = self.make_request("PUT", url, data, access_token=self.tok)
self.assertEqual(channel.code, 403, channel.result)
def test_change_rules(self):
@@ -607,7 +607,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
url = "/_matrix/client/r0/directory/list/room/%s" % test_room_id
data = {"visibility": "public"}
- request, channel = self.make_request("PUT", url, data, access_token=self.tok)
+ channel = self.make_request("PUT", url, data, access_token=self.tok)
self.assertEqual(channel.code, 200, channel.result)
# Attempt to switch the room to "unrestricted"
@@ -1001,7 +1001,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
if power_levels_content_override:
content["power_levels_content_override"] = power_levels_content_override
- request, channel = self.make_request(
+ channel = self.make_request(
"POST", "/_matrix/client/r0/createRoom", content, access_token=self.tok,
)
@@ -1011,7 +1011,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
return channel.json_body["room_id"]
def current_rule_in_room(self, room_id):
- request, channel = self.make_request(
+ channel = self.make_request(
"GET",
"/_matrix/client/r0/rooms/%s/state/%s" % (room_id, ACCESS_RULES_TYPE),
access_token=self.tok,
@@ -1022,7 +1022,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
def change_rule_in_room(self, room_id, new_rule, expected_code=200):
data = {"rule": new_rule}
- request, channel = self.make_request(
+ channel = self.make_request(
"PUT",
"/_matrix/client/r0/rooms/%s/state/%s" % (room_id, ACCESS_RULES_TYPE),
json.dumps(data),
@@ -1033,7 +1033,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
def change_join_rule_in_room(self, room_id, new_join_rule, expected_code=200):
data = {"join_rule": new_join_rule}
- request, channel = self.make_request(
+ channel = self.make_request(
"PUT",
"/_matrix/client/r0/rooms/%s/state/%s" % (room_id, EventTypes.JoinRules),
json.dumps(data),
@@ -1045,7 +1045,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
def send_threepid_invite(self, address, room_id, expected_code=200):
params = {"id_server": "testis", "medium": "email", "address": address}
- request, channel = self.make_request(
+ channel = self.make_request(
"POST",
"/_matrix/client/r0/rooms/%s/invite" % room_id,
json.dumps(params),
@@ -1062,9 +1062,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
state_key,
)
- request, channel = self.make_request(
- "PUT", path, json.dumps(body), access_token=tok
- )
+ channel = self.make_request("PUT", path, json.dumps(body), access_token=tok)
self.assertEqual(channel.code, expect_code, channel.result)
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 721f34a7f7..67f7dc43c3 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -545,9 +545,7 @@ class AccountValidityUserDirectoryTestCase(unittest.HomeserverTestCase):
"enable_renewal_emails": False,
}
request_data = json.dumps(params)
- request, channel = self.make_request(
- b"POST", url, request_data, access_token=admin_tok
- )
+ channel = self.make_request(b"POST", url, request_data, access_token=admin_tok)
self.assertEquals(channel.result["code"], b"200", channel.result)
# Mock the homeserver's HTTP client
@@ -585,9 +583,7 @@ class AccountValidityUserDirectoryTestCase(unittest.HomeserverTestCase):
"enable_renewal_emails": False,
}
request_data = json.dumps(params)
- request, channel = self.make_request(
- b"POST", url, request_data, access_token=admin_tok
- )
+ channel = self.make_request(b"POST", url, request_data, access_token=admin_tok)
self.assertEquals(channel.result["code"], b"200", channel.result)
# Wait for the background job to run which hides expired users in the directory
@@ -618,9 +614,7 @@ class AccountValidityUserDirectoryTestCase(unittest.HomeserverTestCase):
"enable_renewal_emails": False,
}
request_data = json.dumps(params)
- request, channel = self.make_request(
- b"POST", url, request_data, access_token=admin_tok
- )
+ channel = self.make_request(b"POST", url, request_data, access_token=admin_tok)
self.assertEquals(channel.result["code"], b"200", channel.result)
self.pump(10)
@@ -732,7 +726,7 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase):
# Move 1 day forward. Try to renew with the same token again.
url = "/_matrix/client/unstable/account_validity/renew?token=%s" % renewal_token
- request, channel = self.make_request(b"GET", url)
+ channel = self.make_request(b"GET", url)
self.assertEquals(channel.result["code"], b"200", channel.result)
# Check that we're getting HTML back.
diff --git a/tests/rest/client/v2_alpha/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py
index d0414864ab..7f68032d9d 100644
--- a/tests/rest/client/v2_alpha/test_sync.py
+++ b/tests/rest/client/v2_alpha/test_sync.py
@@ -349,7 +349,7 @@ class SyncKnockTestCase(
self.knocker_tok = self.login("knocker", "monkey")
# Perform an initial sync for the knocking user.
- _, channel = self.make_request(
+ channel = self.make_request(
"GET", self.url % self.next_batch, access_token=self.tok,
)
self.assertEqual(channel.code, 200, channel.json_body)
@@ -366,7 +366,7 @@ class SyncKnockTestCase(
def test_knock_room_state(self):
"""Tests that /sync returns state from a room after knocking on it."""
# Knock on a room
- _, channel = self.make_request(
+ channel = self.make_request(
"POST",
"/_matrix/client/unstable/xyz.amorgan.knock/%s" % (self.room_id,),
b"{}",
@@ -381,7 +381,7 @@ class SyncKnockTestCase(
}
# Check that /sync includes stripped state from the room
- _, channel = self.make_request(
+ channel = self.make_request(
"GET", self.url % self.next_batch, access_token=self.knocker_tok,
)
self.assertEqual(channel.code, 200, channel.json_body)
diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py
index 0937f304cf..27e59e3891 100644
--- a/tests/rulecheck/test_domainrulecheck.py
+++ b/tests/rulecheck/test_domainrulecheck.py
@@ -22,7 +22,6 @@ from synapse.rest.client.v1 import login, room
from synapse.rulecheck.domain_rule_checker import DomainRuleChecker
from tests import unittest
-from tests.server import make_request
class DomainRuleCheckerTestCase(unittest.TestCase):
@@ -311,7 +310,7 @@ class DomainRuleCheckerRoomTestCase(unittest.HomeserverTestCase):
expect_code=403,
)
- request, channel = self.make_request(
+ channel = self.make_request(
"POST",
"rooms/%s/invite" % (room_id),
{"address": "foo@bar.com", "medium": "email", "id_server": "localhost"},
@@ -322,12 +321,8 @@ class DomainRuleCheckerRoomTestCase(unittest.HomeserverTestCase):
def _create_room(self, token, content={}):
path = "/_matrix/client/r0/createRoom?access_token=%s" % (token,)
- request, channel = make_request(
- self.hs.get_reactor(),
- self.site,
- "POST",
- path,
- content=json.dumps(content).encode("utf8"),
+ channel = self.make_request(
+ "POST", path, content=json.dumps(content).encode("utf8"),
)
return channel
|
