summary refs log tree commit diff
path: root/tests/replication
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-12-15 14:51:25 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-15 22:32:12 +0000
commit7eebe4b3fc3129e4571d58c3cea5eeccc584e072 (patch)
tree3dff8e5f146206d5724162f859491bd22a52f4a9 /tests/replication
parentPreparatory refactoring of the SamlHandlerTestCase (#8938) (diff)
downloadsynapse-7eebe4b3fc3129e4571d58c3cea5eeccc584e072.tar.xz
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.
Diffstat (limited to 'tests/replication')
-rw-r--r--tests/replication/test_auth.py10
-rw-r--r--tests/replication/test_client_reader_shard.py8
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/replication/test_auth.py b/tests/replication/test_auth.py
index fe9e4d5f9a..aee839dc69 100644
--- a/tests/replication/test_auth.py
+++ b/tests/replication/test_auth.py
@@ -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")
diff --git a/tests/replication/test_client_reader_shard.py b/tests/replication/test_client_reader_shard.py
index fdaad3d8ad..6cdf6a099b 100644
--- a/tests/replication/test_client_reader_shard.py
+++ b/tests/replication/test_client_reader_shard.py
@@ -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")