summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-07-20 22:41:13 +1000
committerGitHub <noreply@github.com>2018-07-20 22:41:13 +1000
commite1a237eaabf0ba37f242897700f9bf00729976b8 (patch)
tree61b5addbdf6df58fe558c5951eb113521c7c7c89 /tests/utils.py
parentMerge pull request #3564 from matrix-org/hawkowl/markdown (diff)
downloadsynapse-e1a237eaabf0ba37f242897700f9bf00729976b8.tar.xz
Admin API for creating new users (#3415)
Diffstat (limited to '')
-rw-r--r--tests/utils.py3
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
         )