summary refs log tree commit diff
path: root/tests/unittest.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/unittest.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/unittest.py')
-rw-r--r--tests/unittest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittest.py b/tests/unittest.py

index d64702b0c2..36df43c137 100644 --- a/tests/unittest.py +++ b/tests/unittest.py
@@ -342,7 +342,7 @@ class HomeserverTestCase(TestCase): # Parse the config from a config dict into a HomeServerConfig config_obj = HomeServerConfig() - config_obj.parse_config_dict(config) + config_obj.parse_config_dict(config, "", "") kwargs["config"] = config_obj hs = setup_test_homeserver(self.addCleanup, *args, **kwargs)