diff options
| author | realtyem <realtyem@gmail.com> | 2022-12-01 06:38:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 07:38:27 -0500 |
| commit | 854a6884d81c95297bf93badcddc00a4cab93418 (patch) | |
| tree | a32b5c54f84ce615031e92ef1a0d997e0209caff /tests/replication/test_pusher_shard.py | |
| parent | Cite launchpad bug that says ubuntu's pkgs are old (#14517) (diff) | |
| download | synapse-854a6884d81c95297bf93badcddc00a4cab93418.tar.xz | |
Modernize unit tests configuration settings for workers. (#14568)
Use the newer foo_instances configuration instead of the deprecated flags to enable specific features (e.g. start_pushers).
Diffstat (limited to 'tests/replication/test_pusher_shard.py')
| -rw-r--r-- | tests/replication/test_pusher_shard.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/replication/test_pusher_shard.py b/tests/replication/test_pusher_shard.py index 59fea93e49..ca18ad6553 100644 --- a/tests/replication/test_pusher_shard.py +++ b/tests/replication/test_pusher_shard.py @@ -38,11 +38,6 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): self.other_user_id = self.register_user("otheruser", "pass") self.other_access_token = self.login("otheruser", "pass") - def default_config(self): - conf = super().default_config() - conf["start_pushers"] = False - return conf - def _create_pusher_and_send_msg(self, localpart): # Create a user that will get push notifications user_id = self.register_user(localpart, "pass") @@ -92,8 +87,8 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): ) self.make_worker_hs( - "synapse.app.pusher", - {"start_pushers": False}, + "synapse.app.generic_worker", + {"worker_name": "pusher1", "pusher_instances": ["pusher1"]}, proxied_blacklisted_http_client=http_client_mock, ) @@ -122,9 +117,8 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): ) self.make_worker_hs( - "synapse.app.pusher", + "synapse.app.generic_worker", { - "start_pushers": True, "worker_name": "pusher1", "pusher_instances": ["pusher1", "pusher2"], }, @@ -137,9 +131,8 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): ) self.make_worker_hs( - "synapse.app.pusher", + "synapse.app.generic_worker", { - "start_pushers": True, "worker_name": "pusher2", "pusher_instances": ["pusher1", "pusher2"], }, |