diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
| commit | 12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch) | |
| tree | 1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /tests/handlers/test_directory.py | |
| parent | ensure we always include the members for a given timeline block (diff) | |
| parent | typoe (diff) | |
| download | synapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz | |
merge proper fix to bug 2969
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) |