summary refs log tree commit diff
path: root/tests/handlers/test_profile.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-13 11:45:08 +0000
committerGitHub <noreply@github.com>2018-03-13 11:45:08 +0000
commit141c343e030ea32e6c904808dfaded6c839ff8b4 (patch)
treeb0e25cfc9cd8827dac8edf4e0dee242417fd1122 /tests/handlers/test_profile.py
parentMerge pull request #2962 from matrix-org/rav/purge_history_txns (diff)
parentFix docstring types (diff)
downloadsynapse-141c343e030ea32e6c904808dfaded6c839ff8b4.tar.xz
Merge pull request #2976 from matrix-org/erikj/replication_registry
Split out edu/query registration to a separate class
Diffstat (limited to 'tests/handlers/test_profile.py')
-rw-r--r--tests/handlers/test_profile.py9
1 files changed, 4 insertions, 5 deletions
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", ])