diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-13 10:39:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-13 10:39:19 +0000 |
| commit | 631a73f7ef7d89c43be47cf01c7c27a1d633052d (patch) | |
| tree | 53d25d43121a1450f5cbb10eb781b1dc828406d8 /tests | |
| parent | Split out edu/query registration to a separate class (diff) | |
| download | synapse-631a73f7ef7d89c43be47cf01c7c27a1d633052d.tar.xz | |
Fix tests
Diffstat (limited to '')
| -rw-r--r-- | tests/handlers/test_directory.py | 9 | ||||
| -rw-r--r-- | tests/handlers/test_profile.py | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 5712773909..b103921498 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_registry=self.mock_registry, ) hs.handlers = DirectoryHandlers(hs) diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py index a5f47181d7..73223ffbd3 100644 --- a/tests/handlers/test_profile.py +++ b/tests/handlers/test_profile.py @@ -37,23 +37,22 @@ class ProfileTestCase(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, handlers=None, resource_for_federation=Mock(), replication_layer=self.mock_federation, + federation_registry=self.mock_registry, ratelimiter=NonCallableMock(spec_set=[ "send_message", ]) |