summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
committerTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
commitbc50cffa2698a484dffda0e1f64c832132b1ff48 (patch)
tree401ed265c319a277506cb4ddfe9c12bbcb0d4716 /tests/utils.py
parentMore timeout (diff)
parentSupport m.login.sso (#4220) (diff)
downloadsynapse-travis/intentional-timeout.tar.xz
Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 67ab916f30..52ab762010 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -134,6 +134,7 @@ def default_config(name): config.hs_disabled_limit_type = "" config.max_mau_value = 50 config.mau_trial_days = 0 + config.mau_stats_only = False config.mau_limits_reserved_threepids = [] config.admin_contact = None config.rc_messages_per_second = 10000