summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorDan Callahan <danc@element.io>2021-01-26 15:38:22 +0000
committerDan Callahan <danc@element.io>2021-01-26 15:38:22 +0000
commita06dd1d6b5a36a473ad58c186cac61ba929dc154 (patch)
tree5a8d355e61b47803acbc8cfabf391b4059b29dcf /tests/utils.py
parentFix state endpoint to be faster (diff)
parentTweak changes. (diff)
downloadsynapse-a06dd1d6b5a36a473ad58c186cac61ba929dc154.tar.xz
Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/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": {},