diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-04-08 18:30:38 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-04-08 18:30:38 +0100 |
| commit | 9e167d9c53af8be7386ba7e2bd14ce385471df87 (patch) | |
| tree | e5578a06584477e553b8e0eea11c3aa1f40dc2b5 /tests/config/test_load.py | |
| parent | remove unused param on `make_tuple_comparison_clause` (diff) | |
| parent | Merge pull request #9769 from matrix-org/rav/fix_bionic (diff) | |
| download | synapse-9e167d9c53af8be7386ba7e2bd14ce385471df87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/drop_py35
Diffstat (limited to 'tests/config/test_load.py')
| -rw-r--r-- | tests/config/test_load.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py index 734a9983e8..c109425671 100644 --- a/tests/config/test_load.py +++ b/tests/config/test_load.py @@ -20,6 +20,7 @@ from io import StringIO import yaml +from synapse.config import ConfigError from synapse.config.homeserver import HomeServerConfig from tests import unittest @@ -35,9 +36,9 @@ class ConfigLoadingTestCase(unittest.TestCase): def test_load_fails_if_server_name_missing(self): self.generate_config_and_remove_lines_containing("server_name") - with self.assertRaises(Exception): + with self.assertRaises(ConfigError): HomeServerConfig.load_config("", ["-c", self.file]) - with self.assertRaises(Exception): + with self.assertRaises(ConfigError): HomeServerConfig.load_or_generate_config("", ["-c", self.file]) def test_generates_and_loads_macaroon_secret_key(self): |