Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-10 23:10:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Pass config_dir_path and data_dir_path into Config.read_config. (#5522)

Browse source 
* 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
This commit is contained in:
Richard van der Hoff 2019-06-24 11:34:45 +01:00 • committed by GitHub
parent 21bf4318b5
commit c3c6b00d95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 104 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/config/test_tls.py
View file

@ -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()

2
tests/http/federation/test_matrix_federation_agent.py
View file

@ -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,

2
tests/unittest.py
View file

@ -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)

2
tests/utils.py
View file

@ -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