summary refs log tree commit diff
path: root/tests/http/federation
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 11:34:45 +0100
committerGitHub <noreply@github.com>2019-06-24 11:34:45 +0100
commitc3c6b00d956937ad50673cec75eab7989938a39b (patch)
treebb60d510a3c0c95c678179559914c6f7c60c3821 /tests/http/federation
parentFactor acme bits out to a separate file (#5521) (diff)
downloadsynapse-c3c6b00d956937ad50673cec75eab7989938a39b.tar.xz
Pass config_dir_path and data_dir_path into Config.read_config. (#5522)
* Pull config_dir_path and data_dir_path calculation out of read_config_files

* Pass config_dir_path and data_dir_path into read_config
Diffstat (limited to 'tests/http/federation')
-rw-r--r--tests/http/federation/test_matrix_federation_agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py

index b1094c1448..417fda3ab2 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py
@@ -78,7 +78,7 @@ class MatrixFederationAgentTests(TestCase): # config_dict["trusted_key_servers"] = [] self._config = config = HomeServerConfig() - config.parse_config_dict(config_dict) + config.parse_config_dict(config_dict, "", "") self.agent = MatrixFederationAgent( reactor=self.reactor,