Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace `request.code` with `channel.code` 

The two are equivalent, but really we want to check the HTTP result that got
returned to the channel, not the code that the Request object *intended* to
return to the channel.
This commit is contained in:
Richard van der Hoff 2020-12-15 14:51:25 +00:00
parent 01333681bc
commit 7eebe4b3fc
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/http/test_additional_resource.py
View File

@ -48,7 +48,7 @@ class AdditionalResourceTests(HomeserverTestCase):
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
self.assertEqual(channel.json_body, {"some_key": "some_value_async"})
def test_sync(self):
@ -57,5 +57,5 @@ class AdditionalResourceTests(HomeserverTestCase):
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
self.assertEqual(channel.json_body, {"some_key": "some_value_sync"})

10
tests/replication/test_auth.py
View File

@ -66,7 +66,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
"register",
{"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel
self.assertEqual(request_1.code, 401)
self.assertEqual(channel_1.code, 401)
# Grab the session
session = channel_1.json_body["session"]
@ -84,7 +84,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
"""With no authentication the request should finish.
"""
request, channel = self._test_register()
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
# We're given a registered user.
self.assertEqual(channel.json_body["user_id"], "@user:test")
@ -94,7 +94,7 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
"""If the main process expects a secret that is not provided, an error results.
"""
request, channel = self._test_register()
self.assertEqual(request.code, 500)
self.assertEqual(channel.code, 500)
@override_config(
{
@ -106,14 +106,14 @@ class WorkerAuthenticationTestCase(BaseMultiWorkerStreamTestCase):
"""If the main process receives the wrong secret, an error results.
"""
request, channel = self._test_register()
self.assertEqual(request.code, 500)
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()
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
# We're given a registered user.
self.assertEqual(channel.json_body["user_id"], "@user:test")

8
tests/replication/test_client_reader_shard.py
View File

@ -48,7 +48,7 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register",
{"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel
self.assertEqual(request_1.code, 401)
self.assertEqual(channel_1.code, 401)
# Grab the session
session = channel_1.json_body["session"]
@ -61,7 +61,7 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register",
{"auth": {"session": session, "type": "m.login.dummy"}},
) # type: SynapseRequest, FakeChannel
self.assertEqual(request_2.code, 200)
self.assertEqual(channel_2.code, 200)
# We're given a registered user.
self.assertEqual(channel_2.json_body["user_id"], "@user:test")
@ -80,7 +80,7 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register",
{"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel
self.assertEqual(request_1.code, 401)
self.assertEqual(channel_1.code, 401)
# Grab the session
session = channel_1.json_body["session"]
@ -94,7 +94,7 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register",
{"auth": {"session": session, "type": "m.login.dummy"}},
) # type: SynapseRequest, FakeChannel
self.assertEqual(request_2.code, 200)
self.assertEqual(channel_2.code, 200)
# We're given a registered user.
self.assertEqual(channel_2.json_body["user_id"], "@user:test")

4
tests/rest/client/v2_alpha/test_account.py
View File

@ -353,7 +353,7 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
# Check that this access token has been invalidated.
request, channel = self.make_request("GET", "account/whoami")
self.assertEqual(request.code, 401)
self.assertEqual(channel.code, 401)
def test_pending_invites(self):
"""Tests that deactivating a user rejects every pending invite for them."""
@ -410,7 +410,7 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
request, channel = self.make_request(
"POST", "account/deactivate", request_data, access_token=tok
)
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
class ThreepidEmailRestTestCase(unittest.HomeserverTestCase):

10
tests/rest/client/v2_alpha/test_auth.py
View File

@ -71,7 +71,7 @@ class FallbackAuthTests(unittest.HomeserverTestCase):
"POST", "register", body
) # type: SynapseRequest, FakeChannel
self.assertEqual(request.code, expected_response)
self.assertEqual(channel.code, expected_response)
return channel
def recaptcha(
@ -84,7 +84,7 @@ class FallbackAuthTests(unittest.HomeserverTestCase):
request, channel = self.make_request(
"GET", "auth/m.login.recaptcha/fallback/web?session=" + session
) # type: SynapseRequest, FakeChannel
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
request, channel = self.make_request(
"POST",
@ -92,7 +92,7 @@ class FallbackAuthTests(unittest.HomeserverTestCase):
+ post_session
+ "&g-recaptcha-response=a",
)
self.assertEqual(request.code, expected_post_response)
self.assertEqual(channel.code, expected_post_response)
# The recaptcha handler is called with the response given
attempts = self.recaptcha_checker.recaptcha_attempts
@ -201,7 +201,7 @@ class UIAuthTests(unittest.HomeserverTestCase):
) # type: SynapseRequest, FakeChannel
# Ensure the response is sane.
self.assertEqual(request.code, expected_response)
self.assertEqual(channel.code, expected_response)
return channel
@ -214,7 +214,7 @@ class UIAuthTests(unittest.HomeserverTestCase):
) # type: SynapseRequest, FakeChannel
# Ensure the response is sane.
self.assertEqual(request.code, expected_response)
self.assertEqual(channel.code, expected_response)
return channel

2
tests/rest/client/v2_alpha/test_register.py
View File

@ -559,7 +559,7 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase):
request, channel = self.make_request(
"POST", "account/deactivate", request_data, access_token=tok
)
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
self.reactor.advance(datetime.timedelta(days=8).total_seconds())

2
tests/rest/test_health.py
View File

@ -27,5 +27,5 @@ class HealthCheckTests(unittest.HomeserverTestCase):
def test_health(self):
request, channel = self.make_request("GET", "/health", shorthand=False)
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
self.assertEqual(channel.result["body"], b"OK")

4
tests/rest/test_well_known.py
View File

@ -32,7 +32,7 @@ class WellKnownTests(unittest.HomeserverTestCase):
"GET", "/.well-known/matrix/client", shorthand=False
)
self.assertEqual(request.code, 200)
self.assertEqual(channel.code, 200)
self.assertEqual(
channel.json_body,
{
@ -48,4 +48,4 @@ class WellKnownTests(unittest.HomeserverTestCase):
"GET", "/.well-known/matrix/client", shorthand=False
)
self.assertEqual(request.code, 404)
self.assertEqual(channel.code, 404)