diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-10 01:11:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 01:11:00 +0100 |
| commit | a3599dda97aa26be43d0403cdc3ede831000c396 (patch) | |
| tree | 3ef1b5540518840d04455c2b49d4e549271b4b8c /tests | |
| parent | Merge pull request #3061 from NotAFile/add-some-byte-strings (diff) | |
| parent | Merge branch 'develop' of into allow_auto_join_rooms (diff) | |
| download | synapse-a3599dda97aa26be43d0403cdc3ede831000c396.tar.xz | |
Merge pull request #2996 from krombel/allow_auto_join_rooms
move handling of auto_join_rooms to RegisterHandler
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/client/v1/test_events.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py index 2b89c0a3c7..a8d09600bd 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -123,6 +123,7 @@ class EventStreamPermissionsTestCase(RestTestCase): self.ratelimiter.send_message.return_value = (True, 0) hs.config.enable_registration_captcha = False hs.config.enable_registration = True + hs.config.auto_join_rooms = [] hs.get_handlers().federation_handler = Mock() |