diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-09 16:34:15 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-09 16:34:15 +0000 |
| commit | 6ad9586c84ed8ea97174195705b68abb4e11ba99 (patch) | |
| tree | e0b6820e6a1ca2693e898e5f9eedb7243d2b427c /tests | |
| parent | Change a log from debug to info (diff) | |
| parent | Typo (diff) | |
| download | synapse-6ad9586c84ed8ea97174195705b68abb4e11ba99.tar.xz | |
Merge pull request #565 from matrix-org/erikj/macaroon_config
Derive macaroon_secret_key from signing key.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config/test_load.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py index 7f41279715..fbbbf93fef 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_succeeds_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("", [ |