diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-02-11 11:37:30 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-02-11 11:37:30 +0000 |
| commit | 896253e085751df88e747b29e638916b15cf7a0e (patch) | |
| tree | ea62bdb8650946adfa6c9dc4603ce87a39e55e3e /tests/handlers/test_federation.py | |
| parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
| download | synapse-896253e085751df88e747b29e638916b15cf7a0e.tar.xz | |
Factor out some of the common homeserver setup code into a
setup_test_homeserver function in utils.
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 4270481139..c13ade3286 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -19,20 +19,17 @@ from tests import unittest from synapse.api.constants import EventTypes from synapse.events import FrozenEvent from synapse.handlers.federation import FederationHandler -from synapse.server import HomeServer from mock import NonCallableMock, ANY, Mock -from ..utils import MockKey +from ..utils import setup_test_homeserver class FederationTestCase(unittest.TestCase): + @defer.inlineCallbacks def setUp(self): - self.mock_config = NonCallableMock() - self.mock_config.signing_key = [MockKey()] - self.state_handler = NonCallableMock(spec_set=[ "compute_event_context", ]) @@ -43,9 +40,8 @@ class FederationTestCase(unittest.TestCase): ]) self.hostname = "test" - hs = HomeServer( + hs = yield setup_test_homeserver( self.hostname, - db_pool=None, datastore=NonCallableMock(spec_set=[ "persist_event", "store_room", @@ -61,7 +57,6 @@ class FederationTestCase(unittest.TestCase): "room_member_handler", "federation_handler", ]), - config=self.mock_config, auth=self.auth, state_handler=self.state_handler, keyring=Mock(), |