diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:25:42 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:25:42 +0100 |
| commit | f483340b3e20ab19129f9c0ae6b0a1395d8ef762 (patch) | |
| tree | 3097406bf9bcae62e0d3c2d16476bb525764a59d /tests/utils.py | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | Remove incorrect whitespace (diff) | |
| download | synapse-f483340b3e20ab19129f9c0ae6b0a1395d8ef762.tar.xz | |
Merge pull request #229 from matrix-org/auth
Issue macaroons as opaque auth tokens
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index eb035cf48f..80be70b74f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -44,6 +44,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config.signing_key = [MockKey()] config.event_cache_size = 1 config.disable_registration = False + config.macaroon_secret_key = "not even a little secret" + config.server_name = "server.under.test" if "clock" not in kargs: kargs["clock"] = MockClock() |