summary refs log tree commit diff
path: root/tests/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-09 14:55:21 +0000
committerErik Johnston <erik@matrix.org>2016-02-09 14:55:21 +0000
commit13ba8d878ce30dbc16123886a78a0905fc9ad4a5 (patch)
treecd173b0655b7494600418144e9bdaadb13709897 /tests/config
parentDerive macaroon_secret_key from signing key. (diff)
downloadsynapse-13ba8d878ce30dbc16123886a78a0905fc9ad4a5.tar.xz
Fix test
Diffstat (limited to 'tests/config')
-rw-r--r--tests/config/test_load.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py

index 7f41279715..528e878532 100644 --- a/tests/config/test_load.py +++ b/tests/config/test_load.py
@@ -54,10 +54,11 @@ class ConfigLoadingTestCase(unittest.TestCase): "was: %r" % (config.macaroon_secret_key,) ) - def test_load_fails_if_macaroon_secret_key_missing(self): + def test_load_suceeds_if_macaroon_secret_key_missing(self): self.generate_config_and_remove_lines_containing("macaroon") - with self.assertRaises(Exception): - HomeServerConfig.load_config("", ["-c", self.file]) + config1 = HomeServerConfig.load_config("", ["-c", self.file]) + config2 = HomeServerConfig.load_config("", ["-c", self.file]) + self.assertEqual(config1.macaroon_secret_key, config2.macaroon_secret_key) def generate_config(self): HomeServerConfig.load_config("", [