diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-13 13:46:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 13:46:38 +0000 |
| commit | 56e709857ce6f48197061dbb5597d90a75877051 (patch) | |
| tree | eb63a5f203e206a29eaae2fb29b10e8a01ea1de5 /tests/handlers | |
| parent | Merge pull request #2980 from matrix-org/erikj/rm_priv (diff) | |
| parent | Don't build handlers on workers unnecessarily (diff) | |
| download | synapse-56e709857ce6f48197061dbb5597d90a75877051.tar.xz | |
Merge pull request #2979 from matrix-org/erikj/no_handlers
Don't build handlers on workers unnecessarily
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_directory.py | 2 | ||||
| -rw-r--r-- | tests/handlers/test_e2e_keys.py | 2 | ||||
| -rw-r--r-- | tests/handlers/test_profile.py | 3 | ||||
| -rw-r--r-- | tests/handlers/test_typing.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index b103921498..b4f36b27a6 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -47,7 +47,7 @@ class DirectoryTestCase(unittest.TestCase): hs = yield setup_test_homeserver( http_client=None, resource_for_federation=Mock(), - replication_layer=self.mock_federation, + replication_client=self.mock_federation, federation_registry=self.mock_registry, ) hs.handlers = DirectoryHandlers(hs) diff --git a/tests/handlers/test_e2e_keys.py b/tests/handlers/test_e2e_keys.py index d92bf240b1..fe73f2b96c 100644 --- a/tests/handlers/test_e2e_keys.py +++ b/tests/handlers/test_e2e_keys.py @@ -34,7 +34,7 @@ class E2eKeysHandlerTestCase(unittest.TestCase): def setUp(self): self.hs = yield utils.setup_test_homeserver( handlers=None, - replication_layer=mock.Mock(), + replication_client=mock.Mock(), ) self.handler = synapse.handlers.e2e_keys.E2eKeysHandler(self.hs) diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py index 73223ffbd3..c690437682 100644 --- a/tests/handlers/test_profile.py +++ b/tests/handlers/test_profile.py @@ -51,7 +51,8 @@ class ProfileTestCase(unittest.TestCase): http_client=None, handlers=None, resource_for_federation=Mock(), - replication_layer=self.mock_federation, + replication_client=self.mock_federation, + replication_server=Mock(), federation_registry=self.mock_registry, ratelimiter=NonCallableMock(spec_set=[ "send_message", diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index fcd380b03a..a433bbfa8a 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -81,7 +81,7 @@ class TypingNotificationsTestCase(unittest.TestCase): "get_current_state_deltas", ]), state_handler=self.state_handler, - handlers=None, + handlers=Mock(), notifier=mock_notifier, resource_for_client=Mock(), resource_for_federation=self.mock_federation_resource, |