diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-07-23 10:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:03:28 +0100 |
| commit | 9b34f3ea3af233d70412565290468092cf3c5984 (patch) | |
| tree | dcfc00333a843cdc3a011249ef78f8438804dbd4 /tests/utils.py | |
| parent | add trailing comma (diff) | |
| parent | Make the rest of the .iterwhatever go away (#3562) (diff) | |
| download | synapse-9b34f3ea3af233d70412565290468092cf3c5984.tar.xz | |
Merge branch 'develop' into matthew/sync_deleted_devices
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 6adbdbfca1..c3dbff8507 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -65,11 +65,14 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None config.federation_domain_whitelist = None config.federation_rc_reject_limit = 10 config.federation_rc_sleep_limit = 10 + config.federation_rc_sleep_delay = 100 config.federation_rc_concurrent = 10 config.filter_timeline_limit = 5000 config.user_directory_search_all_users = False config.user_consent_server_notice_content = None config.block_events_without_consent_error = None + config.media_storage_providers = [] + config.auto_join_rooms = [] # disable user directory updates, because they get done in the # background, which upsets the test runner. @@ -135,6 +138,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None database_engine=db_engine, room_list_handler=object(), tls_server_context_factory=Mock(), + reactor=reactor, **kargs ) |