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_federation.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_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 7208afdb3b..35c3a4df7b 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -26,12 +26,16 @@ from synapse.federation.units import Pdu from mock import NonCallableMock, ANY -from ..utils import get_mock_call_args +from ..utils import get_mock_call_args, MockKey class FederationTestCase(unittest.TestCase): def setUp(self): + + self.mock_config = NonCallableMock() + self.mock_config.signing_key = [MockKey()] + self.hostname = "test" hs = HomeServer( self.hostname, @@ -48,6 +52,7 @@ class FederationTestCase(unittest.TestCase): "room_member_handler", "federation_handler", ]), + config=self.mock_config, ) self.datastore = hs.get_datastore() |