diff options
| author | Sean Quah <seanq@matrix.org> | 2023-05-03 15:23:16 +0100 |
|---|---|---|
| committer | Sean Quah <seanq@matrix.org> | 2023-05-03 15:23:16 +0100 |
| commit | 8aee823393d6a60740f5e9990626c823f8b46eec (patch) | |
| tree | be0ff5ef1838911bf3e1a0d7a86dbacfdbe8a1a5 /tests | |
| parent | Speed up deleting of old rows in `event_push_actions` (#15531) (diff) | |
| parent | Revert "Reduce the size of the HTTP connection pool for non-pushers" (#15530) (diff) | |
| download | synapse-8aee823393d6a60740f5e9990626c823f8b46eec.tar.xz | |
Merge branch 'release-v1.83' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/push/test_http.py | 2 | ||||
| -rw-r--r-- | tests/replication/test_pusher_shard.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/push/test_http.py b/tests/push/test_http.py index 4f811bb9c0..54f558742d 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py @@ -52,7 +52,7 @@ class HTTPPusherTests(HomeserverTestCase): m.post_json_get_json = post_json_get_json - hs = self.setup_test_homeserver(pusher_http_client=m) + hs = self.setup_test_homeserver(proxied_blacklisted_http_client=m) return hs diff --git a/tests/replication/test_pusher_shard.py b/tests/replication/test_pusher_shard.py index b9bb1a6497..dcb3e6669b 100644 --- a/tests/replication/test_pusher_shard.py +++ b/tests/replication/test_pusher_shard.py @@ -93,7 +93,7 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): self.make_worker_hs( "synapse.app.generic_worker", {"worker_name": "pusher1", "pusher_instances": ["pusher1"]}, - pusher_http_client=http_client_mock, + proxied_blacklisted_http_client=http_client_mock, ) event_id = self._create_pusher_and_send_msg("user") @@ -126,7 +126,7 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): "worker_name": "pusher1", "pusher_instances": ["pusher1", "pusher2"], }, - pusher_http_client=http_client_mock1, + proxied_blacklisted_http_client=http_client_mock1, ) http_client_mock2 = Mock(spec_set=["post_json_get_json"]) @@ -140,7 +140,7 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): "worker_name": "pusher2", "pusher_instances": ["pusher1", "pusher2"], }, - pusher_http_client=http_client_mock2, + proxied_blacklisted_http_client=http_client_mock2, ) # We choose a user name that we know should go to pusher1. |