diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
| commit | bd84755e64a5fd086738a43e049885604ea53927 (patch) | |
| tree | 39b3bf10a5b074c82e48a723670a539b9149a8ee /tests | |
| parent | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz | |
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/client/v1/test_events.py | 1 | ||||
| -rw-r--r-- | tests/utils.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py index f36340121d..36b0f2ff6d 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -128,6 +128,7 @@ class EventStreamPermissionsTestCase(RestTestCase): self.ratelimiter = hs.get_ratelimiter() self.ratelimiter.send_message.return_value = (True, 0) hs.config.enable_registration_captcha = False + hs.config.disable_registration = False hs.get_handlers().federation_handler = Mock() diff --git a/tests/utils.py b/tests/utils.py index 110b9f86b8..81e82a80df 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -42,6 +42,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config = Mock() config.signing_key = [MockKey()] config.event_cache_size = 1 + config.disable_registration = False if datastore is None: db_pool = SQLiteMemoryDbPool() |