summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorShay <hillerys@element.io>2021-11-23 06:46:40 -0800
committerGitHub <noreply@github.com>2021-11-23 06:46:40 -0800
commit7cebaf96447a8ff50c4525ba7667f58127876c5e (patch)
tree0f1226134100c933ce1431406c21098c4ad2081d /tests
parentMerge branch 'master' into develop (diff)
downloadsynapse-7cebaf96447a8ff50c4525ba7667f58127876c5e.tar.xz
Remove code invalidated by deprecated config flag 'trust_identity_servers_for_password_resets' (#11395)
* remove background update code related to deprecated config flag

* changelog entry

* update changelog

* Delete 11394.removal

Duplicate, wrong number

* add no-op background update and change newfragment so it will be consolidated with associated work

* remove unused code

* Remove code associated with deprecated flag from legacy docker dynamic config file

Co-authored-by: reivilibre <oliverw@matrix.org>
Diffstat (limited to '')
-rw-r--r--tests/utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py
index cf8ba5c5db..983859120f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -119,7 +119,6 @@ def default_config(name, parse=False):
         "enable_registration": True,
         "enable_registration_captcha": False,
         "macaroon_secret_key": "not even a little secret",
-        "trusted_third_party_id_servers": [],
         "password_providers": [],
         "worker_replication_url": "",
         "worker_app": None,