summary refs log tree commit diff
path: root/tests/http/federation
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-04-25 06:22:49 -0700
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-04-25 14:22:49 +0100
commit6824ddd93df1cfc347e4c8f423d54fab5bb732fb (patch)
tree4ef1853e6bd78aa2ed9cc75dcf7724b82aa27d97 /tests/http/federation
parentRemove log error for .well-known/matrix/client (#4972) (diff)
downloadsynapse-6824ddd93df1cfc347e4c8f423d54fab5bb732fb.tar.xz
Config option for verifying federation certificates (MSC 1711) (#4967)
Diffstat (limited to 'tests/http/federation')
-rw-r--r--tests/http/federation/test_matrix_federation_agent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py
index dcf184d3cf..e9eb662c4c 100644
--- a/tests/http/federation/test_matrix_federation_agent.py
+++ b/tests/http/federation/test_matrix_federation_agent.py
@@ -39,6 +39,7 @@ from synapse.util.logcontext import LoggingContext
 from tests.http import ServerTLSContext
 from tests.server import FakeTransport, ThreadedMemoryReactorClock
 from tests.unittest import TestCase
+from tests.utils import default_config
 
 logger = logging.getLogger(__name__)
 
@@ -53,7 +54,7 @@ class MatrixFederationAgentTests(TestCase):
 
         self.agent = MatrixFederationAgent(
             reactor=self.reactor,
-            tls_client_options_factory=ClientTLSOptionsFactory(None),
+            tls_client_options_factory=ClientTLSOptionsFactory(default_config("test")),
             _well_known_tls_policy=TrustingTLSPolicyForHTTPS(),
             _srv_resolver=self.mock_resolver,
             _well_known_cache=self.well_known_cache,