diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-24 11:34:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 11:34:45 +0100 |
| commit | c3c6b00d956937ad50673cec75eab7989938a39b (patch) | |
| tree | bb60d510a3c0c95c678179559914c6f7c60c3821 /tests | |
| parent | Factor acme bits out to a separate file (#5521) (diff) | |
| download | synapse-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 '')
| -rw-r--r-- | tests/config/test_tls.py | 2 | ||||
| -rw-r--r-- | tests/http/federation/test_matrix_federation_agent.py | 2 | ||||
| -rw-r--r-- | tests/unittest.py | 2 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/config/test_tls.py b/tests/config/test_tls.py index 0cbbf4e885..a5d88d644a 100644 --- a/tests/config/test_tls.py +++ b/tests/config/test_tls.py @@ -65,7 +65,7 @@ s4niecZKPBizL6aucT59CsunNmmb5Glq8rlAcU+1ZTZZzGYqVYhF6axB9Qg= } t = TestConfig() - t.read_config(config) + t.read_config(config, config_dir_path="", data_dir_path="") t.read_certificate_from_disk(require_cert_and_key=False) warnings = self.flushWarnings() 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, 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) 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 |