summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-11 18:03:30 +0000
committerGitHub <noreply@github.com>2019-02-11 18:03:30 +0000
commit5d27730a73d01bd3ff7eb42a21f2f024493c5b89 (patch)
tree1417404058dddff402e87c40f57850b8d7dd9937 /tests
parentMerge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating (diff)
downloadsynapse-5d27730a73d01bd3ff7eb42a21f2f024493c5b89.tar.xz
Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)
It's nothing to do with refreshing the certificates. No idea why it was here.

Diffstat (limited to 'tests')
-rw-r--r--tests/http/test_fedclient.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py
index 018c77ebcd..b03b37affe 100644
--- a/tests/http/test_fedclient.py
+++ b/tests/http/test_fedclient.py
@@ -43,13 +43,11 @@ def check_logcontext(context):
 
 class FederationClientTests(HomeserverTestCase):
     def make_homeserver(self, reactor, clock):
-
         hs = self.setup_test_homeserver(reactor=reactor, clock=clock)
-        hs.tls_client_options_factory = None
         return hs
 
     def prepare(self, reactor, clock, homeserver):
-        self.cl = MatrixFederationHttpClient(self.hs)
+        self.cl = MatrixFederationHttpClient(self.hs, None)
         self.reactor.lookups["testserv"] = "1.2.3.4"
 
     def test_client_get(self):