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 <richard@matrix.org>2019-05-20 15:55:39 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-20 15:55:39 +0100
commitca03f90ee770d30831448889318bfc92c85daec6 (patch)
tree3b574c7bf4c27ba37bad1b7b5c7e16a540cdd11c /tests/http/federation/test_matrix_federation_agent.py
parentMerge tag 'v0.99.4rc1' into matrix-org-hotfixes (diff)
parentAdd a test room version which updates event ID format (#5210) (diff)
downloadsynapse-ca03f90ee770d30831448889318bfc92c85daec6.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/http/federation/test_matrix_federation_agent.py')
-rw-r--r--tests/http/federation/test_matrix_federation_agent.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py

index 7036615041..ed0ca079d9 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py
@@ -54,7 +54,9 @@ class MatrixFederationAgentTests(TestCase): self.agent = MatrixFederationAgent( reactor=self.reactor, - tls_client_options_factory=ClientTLSOptionsFactory(default_config("test")), + tls_client_options_factory=ClientTLSOptionsFactory( + default_config("test", parse=True) + ), _well_known_tls_policy=TrustingTLSPolicyForHTTPS(), _srv_resolver=self.mock_resolver, _well_known_cache=self.well_known_cache,