diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
| commit | 0b0b24cb82d3337bef5d3dd4b960990934d8d5c5 (patch) | |
| tree | 3cbf0143b30ef340a91a99f5d491ee2eb7aa5e8c /tests/utils.py | |
| parent | Update docs/workers.rst (diff) | |
| parent | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices (diff) | |
| download | synapse-0b0b24cb82d3337bef5d3dd4b960990934d8d5c5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_apis_move
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index e488238bb3..c3dbff8507 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -71,6 +71,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None 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. @@ -136,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 ) |