summary refs log tree commit diff
path: root/tests/config/test_tls.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-27 17:11:57 +0100
committerErik Johnston <erik@matrix.org>2021-05-27 17:11:57 +0100
commitd2fcfef6797d52f2ef874fbb367b3a997b4e47b2 (patch)
tree23fae3c371d70493b5fb8691290942420c53e598 /tests/config/test_tls.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentLimit the number of events sent over replication when persisting events. (#10... (diff)
downloadsynapse-d2fcfef6797d52f2ef874fbb367b3a997b4e47b2.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/config/test_tls.py')
-rw-r--r--tests/config/test_tls.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/config/test_tls.py b/tests/config/test_tls.py

index 183034f7d4..dcf336416c 100644 --- a/tests/config/test_tls.py +++ b/tests/config/test_tls.py
@@ -74,12 +74,11 @@ s4niecZKPBizL6aucT59CsunNmmb5Glq8rlAcU+1ZTZZzGYqVYhF6axB9Qg= config = { "tls_certificate_path": os.path.join(config_dir, "cert.pem"), - "tls_fingerprints": [], } t = TestConfig() t.read_config(config, config_dir_path="", data_dir_path="") - t.read_certificate_from_disk(require_cert_and_key=False) + t.read_tls_certificate() warnings = self.flushWarnings() self.assertEqual(len(warnings), 1)