diff options
author | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
commit | 636a0dbde7082a485c0d4ac58137ecb75f7f23fe (patch) | |
tree | 780ad4589dbde7e0fab416496faee5f3c351d169 /tests/handlers/test_room.py | |
parent | Replace on_send_callback with something a bit clearer so that we can sign mes... (diff) | |
parent | typoe (diff) | |
download | synapse-636a0dbde7082a485c0d4ac58137ecb75f7f23fe.tar.xz |
Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
Diffstat (limited to 'tests/handlers/test_room.py')
-rw-r--r-- | tests/handlers/test_room.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py index a1a2e80492..c88d1c8840 100644 --- a/tests/handlers/test_room.py +++ b/tests/handlers/test_room.py @@ -24,6 +24,7 @@ from synapse.api.constants import Membership from synapse.handlers.room import RoomMemberHandler, RoomCreationHandler from synapse.handlers.profile import ProfileHandler from synapse.server import HomeServer +from ..utils import MockKey from mock import Mock, NonCallableMock @@ -31,6 +32,8 @@ from mock import Mock, NonCallableMock class RoomMemberHandlerTestCase(unittest.TestCase): def setUp(self): + self.mock_config = NonCallableMock() + self.mock_config.signing_key = [MockKey()] self.hostname = "red" hs = HomeServer( self.hostname, @@ -38,7 +41,6 @@ class RoomMemberHandlerTestCase(unittest.TestCase): ratelimiter=NonCallableMock(spec_set=[ "send_message", ]), - config=NonCallableMock(), datastore=NonCallableMock(spec_set=[ "persist_event", "get_joined_hosts_for_room", @@ -57,6 +59,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): ]), auth=NonCallableMock(spec_set=["check"]), state_handler=NonCallableMock(spec_set=["handle_new_event"]), + config=self.mock_config, ) self.federation = NonCallableMock(spec_set=[ |