summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-24 15:31:36 +0100
committerErik Johnston <erik@matrix.org>2019-06-24 15:31:36 +0100
commitad2ba70959cef6055769ec4fa059cfa8675062c0 (patch)
treedefccd8b57a72433773627921f2dbb9f45ca27e2 /tests/utils.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5531 from matrix-org/erikj/workers_pagination_token (diff)
downloadsynapse-ad2ba70959cef6055769ec4fa059cfa8675062c0.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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index bd2c7c954c..da43166f3a 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -182,7 +182,7 @@ def default_config(name, parse=False): if parse: config = HomeServerConfig() - config.parse_config_dict(config_dict) + config.parse_config_dict(config_dict, "", "") return config return config_dict