Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-19 07:54:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove spurious "SynapseRequest" result from `make_request"

Browse source 
This was never used, so let's get rid of it.
This commit is contained in:
Richard van der Hoff 2020-12-15 14:44:04 +00:00
parent ac2acf1524
commit 394516ad1b
59 changed files with 742 additions and 983 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/replication/test_auth.py
View file

@ -47,7 +47,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
return config
def _test_register(self) -> Tuple[SynapseRequest, FakeChannel]:
def _test_register(self) -> FakeChannel:
"""Run the actual test:
1. Create a worker homeserver.
@ -59,13 +59,13 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
worker_hs = self.make_worker_hs("synapse.app.client_reader")
site = self._hs_to_site[worker_hs]
request_1, channel_1 = make_request(
channel_1 = make_request(
self.reactor,
site,
"POST",
"register",
{"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel
)
self.assertEqual(channel_1.code, 401)
# Grab the session
@ -83,7 +83,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
def test_no_auth(self):
"""With no authentication the request should finish.
"""
request, channel = self._test_register()
channel = self._test_register()
self.assertEqual(channel.code, 200)
# We're given a registered user.
@ -93,7 +93,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
def test_missing_auth(self):
"""If the main process expects a secret that is not provided, an error results.
"""
request, channel = self._test_register()
channel = self._test_register()
self.assertEqual(channel.code, 500)
@override_config(
@ -105,14 +105,14 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
def test_unauthorized(self):
"""If the main process receives the wrong secret, an error results.
"""
request, channel = self._test_register()
channel = self._test_register()
self.assertEqual(channel.code, 500)
@override_config({"worker_replication_secret": "my-secret"})
def test_authorized(self):
"""The request should finish when the worker provides the authentication header.
"""
request, channel = self._test_register()
channel = self._test_register()
self.assertEqual(channel.code, 200)
# We're given a registered user.