diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-10 11:12:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 11:12:32 +0100 |
| commit | 41b35412bfb52c2fdfd1c25f9244472de5829d3d (patch) | |
| tree | 67e31c7b4be6a9cd56082ff4fdb4b0c07c55910a /tests/config/test_generate.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Add function to load config without generating it (diff) | |
| download | synapse-41b35412bfb52c2fdfd1c25f9244472de5829d3d.tar.xz | |
Merge pull request #863 from matrix-org/markjh/load_config
Add function to load config without generating it
Diffstat (limited to 'tests/config/test_generate.py')
| -rw-r--r-- | tests/config/test_generate.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/config/test_generate.py b/tests/config/test_generate.py index 4329d73974..8f57fbeb23 100644 --- a/tests/config/test_generate.py +++ b/tests/config/test_generate.py @@ -30,7 +30,7 @@ class ConfigGenerationTestCase(unittest.TestCase): shutil.rmtree(self.dir) def test_generate_config_generates_files(self): - HomeServerConfig.load_config("", [ + HomeServerConfig.load_or_generate_config("", [ "--generate-config", "-c", self.file, "--report-stats=yes", |