summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-06-01 15:32:52 +0100
committerDavid Baker <dbkr@users.noreply.github.com>2016-06-01 15:32:52 +0100
commit00c487a8dbba7b7767ed207dcf835d4cb408ccd9 (patch)
treed0510818ac8d57ecfb7f6b6cf33c20676fd14060 /tests
parentMerge pull request #810 from matrix-org/dbkr/limit_email_notifs (diff)
parentInject fake room list handler in tests (diff)
downloadsynapse-00c487a8dbba7b7767ed207dcf835d4cb408ccd9.tar.xz
Merge pull request #808 from matrix-org/dbkr/room_list_spider
Add secondary_directory_servers option to fetch room list from other servers
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 59d985b5f2..006abedbc1 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -67,6 +67,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
             version_string="Synapse/tests",
             database_engine=create_engine(config.database_config),
             get_db_conn=db_pool.get_db_conn,
+            room_list_handler=object(),
             **kargs
         )
         hs.setup()
@@ -75,6 +76,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
             name, db_pool=None, datastore=datastore, config=config,
             version_string="Synapse/tests",
             database_engine=create_engine(config.database_config),
+            room_list_handler=object(),
             **kargs
         )