summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-01-21 16:05:34 +0000
committerErik Johnston <erik@matrix.org>2021-01-21 16:05:34 +0000
commitbde75f5f6600ff74f3fa5d9ff62bcb9f56596886 (patch)
treeff8afa873b562774f386a2168fc77d3ea17e8533 /tests/utils.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentAdd schema update to fix existing DBs affected by #9193 (#9195) (diff)
downloadsynapse-bde75f5f6600ff74f3fa5d9ff62bcb9f56596886.tar.xz
Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 977eeaf6ee..09614093bc 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -159,7 +159,6 @@ def default_config(name, parse=False): "remote": {"per_second": 10000, "burst_count": 10000}, }, "saml2_enabled": False, - "public_baseurl": None, "default_identity_server": None, "key_refresh_interval": 24 * 60 * 60 * 1000, "old_signing_keys": {},