summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-04 16:33:52 +0000
committerErik Johnston <erik@matrix.org>2014-11-04 16:33:52 +0000
commitdd3711bdbd2a439208a9e22b7b15f0c3676e611f (patch)
tree92fd467a77dcef1a994d069f70fc62d68e2f1083 /tests
parentevent <-> pdu mappings are now trivial and will soon be scrapped (diff)
downloadsynapse-dd3711bdbd2a439208a9e22b7b15f0c3676e611f.tar.xz
Fix tests.handlers.test_directory
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_directory.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py

index e10a49a8ac..16c446498d 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py
@@ -21,9 +21,8 @@ from mock import Mock from synapse.server import HomeServer from synapse.handlers.directory import DirectoryHandler -from synapse.storage.directory import RoomAliasMapping -from tests.utils import SQLiteMemoryDbPool +from tests.utils import SQLiteMemoryDbPool, MockKey class DirectoryHandlers(object): @@ -48,11 +47,15 @@ class DirectoryTestCase(unittest.TestCase): db_pool = SQLiteMemoryDbPool() yield db_pool.prepare() + self.mock_config = Mock() + self.mock_config.signing_key = [MockKey()] + hs = HomeServer("test", db_pool=db_pool, http_client=None, resource_for_federation=Mock(), replication_layer=self.mock_federation, + config=self.mock_config, ) hs.handlers = DirectoryHandlers(hs)