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

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)