summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-13 15:45:08 +0000
committerGitHub <noreply@github.com>2018-03-13 15:45:08 +0000
commit95cb401ae0de03af6b939f0bf368386b7a3a3dd9 (patch)
treeb083580d759e063bb51bc15ca801a31a5503f6ea /tests/handlers
parentMerge pull request #2981 from matrix-org/erikj/factor_remote_leave (diff)
parents/replication_client/federation_client/ (diff)
downloadsynapse-95cb401ae0de03af6b939f0bf368386b7a3a3dd9.tar.xz
Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer
Remove ReplicationLayer and user Client/Server directly
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_directory.py2
-rw-r--r--tests/handlers/test_e2e_keys.py2
-rw-r--r--tests/handlers/test_profile.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index b4f36b27a6..7e5332e272 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_client=self.mock_federation,
+            federation_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 fe73f2b96c..d1bd87b898 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_client=mock.Mock(),
+            federation_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 c690437682..458296ee4c 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -51,8 +51,8 @@ class ProfileTestCase(unittest.TestCase):
             http_client=None,
             handlers=None,
             resource_for_federation=Mock(),
-            replication_client=self.mock_federation,
-            replication_server=Mock(),
+            federation_client=self.mock_federation,
+            federation_server=Mock(),
             federation_registry=self.mock_registry,
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",