diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-02-12 10:51:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 10:51:31 +0000 |
| commit | 32b781bfe20034052d71558c0ed9b0df511a1f77 (patch) | |
| tree | ed369129869fa6d3db8dbb949e3d9058c29ccdc4 /tests/config | |
| parent | Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacks (diff) | |
| download | synapse-32b781bfe20034052d71558c0ed9b0df511a1f77.tar.xz | |
Fix error when loading cert if tls is disabled (#4618)
If TLS is disabled, it should not be an error if no cert is given. Fixes #4554.
Diffstat (limited to 'tests/config')
| -rw-r--r-- | tests/config/test_tls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/config/test_tls.py b/tests/config/test_tls.py index d8fd18a9cb..c260d3359f 100644 --- a/tests/config/test_tls.py +++ b/tests/config/test_tls.py @@ -65,7 +65,7 @@ s4niecZKPBizL6aucT59CsunNmmb5Glq8rlAcU+1ZTZZzGYqVYhF6axB9Qg= t = TestConfig() t.read_config(config) - t.read_certificate_from_disk() + t.read_certificate_from_disk(require_cert_and_key=False) warnings = self.flushWarnings() self.assertEqual(len(warnings), 1) |