diff options
| author | Erik Johnston <erik@matrix.org> | 2021-09-17 14:27:41 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-09-17 14:41:29 +0100 |
| commit | 341a92b7d039882637c37e17d3a4d96b893dcf44 (patch) | |
| tree | 9329dc311f9286ab5cc3f1f87b7621ed9dc17f3c /tests | |
| parent | Add types to http.site (diff) | |
| download | synapse-341a92b7d039882637c37e17d3a4d96b893dcf44.tar.xz | |
Fix `SynapseRequest.site` type.
There were two issues: 1) `channel` is actually private type so its hard to type `.site`, and 2) `.site` was actually overwriting an existing member and so we need to rename it.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/logging/test_terse_json.py | 2 | ||||
| -rw-r--r-- | tests/rest/key/v2/test_remote_key_resource.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/logging/test_terse_json.py b/tests/logging/test_terse_json.py index 1160716929..b93d69e86a 100644 --- a/tests/logging/test_terse_json.py +++ b/tests/logging/test_terse_json.py @@ -152,7 +152,7 @@ class TerseJsonTestCase(LoggerCleanupMixin, TestCase): site = Mock(spec=["site_tag", "server_version_string", "getResourceFor"]) site.site_tag = "test-site" site.server_version_string = "Server v1" - request = SynapseRequest(FakeChannel(site, None)) + request = SynapseRequest(FakeChannel(site, None), site) # Call requestReceived to finish instantiating the object. request.content = BytesIO() # Partially skip some of the internal processing of SynapseRequest. diff --git a/tests/rest/key/v2/test_remote_key_resource.py b/tests/rest/key/v2/test_remote_key_resource.py index a75c0ea3f0..4672a68596 100644 --- a/tests/rest/key/v2/test_remote_key_resource.py +++ b/tests/rest/key/v2/test_remote_key_resource.py @@ -84,7 +84,7 @@ class RemoteKeyResourceTestCase(BaseRemoteKeyResourceTestCase): Checks that the response is a 200 and returns the decoded json body. """ channel = FakeChannel(self.site, self.reactor) - req = SynapseRequest(channel) + req = SynapseRequest(channel, self.site) req.content = BytesIO(b"") req.requestReceived( b"GET", @@ -183,7 +183,7 @@ class EndToEndPerspectivesTests(BaseRemoteKeyResourceTestCase): ) channel = FakeChannel(self.site, self.reactor) - req = SynapseRequest(channel) + req = SynapseRequest(channel, self.site) req.content = BytesIO(encode_canonical_json(data)) req.requestReceived( |