diff options
author | Erik Johnston <erik@matrix.org> | 2019-07-17 10:56:55 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-07-17 10:56:55 +0100 |
commit | 5299707329e1c5d6228605ca660800f6dc4cf20d (patch) | |
tree | 5277555c65670460cbd761698b1c920473d2835f /tests/utils.py | |
parent | Merge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #5597 from matrix-org/erikj/admin_api_cmd (diff) | |
download | synapse-5299707329e1c5d6228605ca660800f6dc4cf20d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/utils.py b/tests/utils.py index da43166f3a..8a94ce0b47 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -34,6 +34,7 @@ from synapse.config.homeserver import HomeServerConfig from synapse.config.server import DEFAULT_ROOM_VERSION from synapse.federation.transport import server as federation_server from synapse.http.server import HttpServer +from synapse.logging.context import LoggingContext from synapse.server import HomeServer from synapse.storage import DataStore from synapse.storage.engines import PostgresEngine, create_engine @@ -42,7 +43,6 @@ from synapse.storage.prepare_database import ( _setup_new_database, prepare_database, ) -from synapse.util.logcontext import LoggingContext from synapse.util.ratelimitutils import FederationRateLimiter # set this to True to run the tests against postgres instead of sqlite. @@ -152,12 +152,6 @@ def default_config(name, parse=False): "mau_stats_only": False, "mau_limits_reserved_threepids": [], "admin_contact": None, - "rc_federation": { - "reject_limit": 10, - "sleep_limit": 10, - "sleep_delay": 10, - "concurrent": 10, - }, "rc_message": {"per_second": 10000, "burst_count": 10000}, "rc_registration": {"per_second": 10000, "burst_count": 10000}, "rc_login": { |