summary refs log tree commit diff
path: root/tests/config/test_workers.py
diff options
context:
space:
mode:
authorJason Little <realtyem@gmail.com>2023-07-07 02:45:25 -0500
committerGitHub <noreply@github.com>2023-07-07 07:45:25 +0000
commit2481b7dfa41c1c890346136f04344a4e1660ef32 (patch)
tree092a1336c2d8e861c2ed69628db754237569df17 /tests/config/test_workers.py
parentUpdate link to the clients webpage, fix #15825 (#15874) (diff)
downloadsynapse-2481b7dfa41c1c890346136f04344a4e1660ef32.tar.xz
Remove `worker_replication_*` deprecated settings, with helpful errors on startup (#15860)
Co-authored-by: reivilibre <oliverw@matrix.org>
Diffstat (limited to 'tests/config/test_workers.py')
-rw-r--r--tests/config/test_workers.py27
1 files changed, 1 insertions, 26 deletions
diff --git a/tests/config/test_workers.py b/tests/config/test_workers.py

index 086359fd71..2a643ae4f3 100644 --- a/tests/config/test_workers.py +++ b/tests/config/test_workers.py
@@ -17,7 +17,7 @@ from unittest.mock import Mock from immutabledict import immutabledict from synapse.config import ConfigError -from synapse.config.workers import InstanceLocationConfig, WorkerConfig +from synapse.config.workers import WorkerConfig from tests.unittest import TestCase @@ -323,28 +323,3 @@ class WorkerDutyConfigTestCase(TestCase): ) self.assertTrue(worker2_config.should_notify_appservices) self.assertFalse(worker2_config.should_update_user_directory) - - def test_worker_instance_map_compat(self) -> None: - """ - Test that `worker_replication_*` settings are compatibly handled by - adding them to the instance map as a `main` entry. - """ - - worker1_config = self._make_worker_config( - worker_app="synapse.app.generic_worker", - worker_name="worker1", - extras={ - "notify_appservices_from_worker": "worker2", - "update_user_directory_from_worker": "worker1", - "worker_replication_host": "127.0.0.42", - "worker_replication_http_port": 1979, - }, - ) - self.assertEqual( - worker1_config.instance_map, - { - "master": InstanceLocationConfig( - host="127.0.0.42", port=1979, tls=False - ), - }, - )