diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-12 09:59:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 09:59:53 +0000 |
| commit | 8a2e3164130bce3a43b4c499db8c0cc6c4ae0c4d (patch) | |
| tree | 9aecae58476c7fa957324ea960bdcc4a24158c59 /tests | |
| parent | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) (diff) | |
| parent | fix tests (diff) | |
| download | synapse-8a2e3164130bce3a43b4c499db8c0cc6c4ae0c4d.tar.xz | |
Merge pull request #4613 from matrix-org/rav/deprecate_no_tls
Infer no_tls from presence of TLS listeners
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config/test_tls.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/config/test_tls.py b/tests/config/test_tls.py index 4ccaf35603..d8fd18a9cb 100644 --- a/tests/config/test_tls.py +++ b/tests/config/test_tls.py @@ -20,6 +20,11 @@ from synapse.config.tls import TlsConfig from tests.unittest import TestCase +class TestConfig(TlsConfig): + def has_tls_listener(self): + return False + + class TLSConfigTests(TestCase): def test_warn_self_signed(self): @@ -55,11 +60,10 @@ s4niecZKPBizL6aucT59CsunNmmb5Glq8rlAcU+1ZTZZzGYqVYhF6axB9Qg= config = { "tls_certificate_path": os.path.join(config_dir, "cert.pem"), - "no_tls": True, "tls_fingerprints": [] } - t = TlsConfig() + t = TestConfig() t.read_config(config) t.read_certificate_from_disk() |