summary refs log tree commit diff
path: root/tests/http/federation/test_matrix_federation_agent.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-03-17 17:40:37 +0100
committerGitHub <noreply@github.com>2020-03-17 16:40:37 +0000
commit85845e048cd8d2674ad38dd00e8a934b4b960adc (patch)
tree69629a1b986a9df0cd3412faf4beb3dcaba7dee5 /tests/http/federation/test_matrix_federation_agent.py
parentShare SSL options for well-known requests (#29) (diff)
downloadsynapse-85845e048cd8d2674ad38dd00e8a934b4b960adc.tar.xz
Share SSL contexts for non-federation requests (#30)
* Share SSL contexts for non-federation requests

* newsfile
Diffstat (limited to 'tests/http/federation/test_matrix_federation_agent.py')
-rw-r--r--tests/http/federation/test_matrix_federation_agent.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py

index 2ca9f8a0cd..16a1d31a64 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py
@@ -30,7 +30,7 @@ from twisted.web.http_headers import Headers from twisted.web.iweb import IPolicyForHTTPS from synapse.config.homeserver import HomeServerConfig -from synapse.crypto.context_factory import ClientTLSOptionsFactory +from synapse.crypto.context_factory import FederationPolicyForHTTPS from synapse.http.federation.matrix_federation_agent import ( MatrixFederationAgent, _cache_period_from_headers, @@ -79,7 +79,7 @@ class MatrixFederationAgentTests(TestCase): self.agent = MatrixFederationAgent( reactor=self.reactor, - tls_client_options_factory=ClientTLSOptionsFactory(config), + tls_client_options_factory=FederationPolicyForHTTPS(config), _srv_resolver=self.mock_resolver, _well_known_cache=self.well_known_cache, ) @@ -703,7 +703,7 @@ class MatrixFederationAgentTests(TestCase): agent = MatrixFederationAgent( reactor=self.reactor, - tls_client_options_factory=ClientTLSOptionsFactory(config), + tls_client_options_factory=FederationPolicyForHTTPS(config), _srv_resolver=self.mock_resolver, _well_known_cache=self.well_known_cache, )