diff options
author | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
---|---|---|
committer | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
commit | 88964b987e1d80d2dc9e81fc3ebc51afd9defbe1 (patch) | |
tree | c98c28e51a8d52a8878cf2d888a4a110a835d8a8 /tests/handlers/test_directory.py | |
parent | Document the additional routes for the event_creator worker (diff) | |
parent | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check (diff) | |
download | synapse-88964b987e1d80d2dc9e81fc3ebc51afd9defbe1.tar.xz |
Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Diffstat (limited to 'tests/handlers/test_directory.py')
-rw-r--r-- | tests/handlers/test_directory.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 5712773909..7e5332e272 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -35,21 +35,20 @@ class DirectoryTestCase(unittest.TestCase): @defer.inlineCallbacks def setUp(self): - self.mock_federation = Mock(spec=[ - "make_query", - "register_edu_handler", - ]) + self.mock_federation = Mock() + self.mock_registry = Mock() self.query_handlers = {} def register_query_handler(query_type, handler): self.query_handlers[query_type] = handler - self.mock_federation.register_query_handler = register_query_handler + self.mock_registry.register_query_handler = register_query_handler hs = yield setup_test_homeserver( http_client=None, resource_for_federation=Mock(), - replication_layer=self.mock_federation, + federation_client=self.mock_federation, + federation_registry=self.mock_registry, ) hs.handlers = DirectoryHandlers(hs) |