summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorrealtyem <realtyem@gmail.com>2022-12-01 06:38:27 -0600
committerGitHub <noreply@github.com>2022-12-01 07:38:27 -0500
commit854a6884d81c95297bf93badcddc00a4cab93418 (patch)
treea32b5c54f84ce615031e92ef1a0d997e0209caff /tests/utils.py
parentCite launchpad bug that says ubuntu's pkgs are old (#14517) (diff)
downloadsynapse-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/utils.py')
-rw-r--r--tests/utils.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 045a8b5fa7..d76bf9716a 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -125,7 +125,8 @@ def default_config(
     """
     config_dict = {
         "server_name": name,
-        "send_federation": False,
+        # Setting this to an empty list turns off federation sending.
+        "federation_sender_instances": [],
         "media_store_path": "media",
         # the test signing key is just an arbitrary ed25519 key to keep the config
         # parser happy
@@ -183,8 +184,9 @@ def default_config(
         # rooms will fail.
         "default_room_version": DEFAULT_ROOM_VERSION,
         # disable user directory updates, because they get done in the
-        # background, which upsets the test runner.
-        "update_user_directory": False,
+        # background, which upsets the test runner. Setting this to an
+        # (obviously) fake worker name disables updating the user directory.
+        "update_user_directory_from_worker": "does_not_exist_worker_name",
         "caches": {"global_factor": 1, "sync_response_cache_duration": 0},
         "listeners": [{"port": 0, "type": "http"}],
     }