diff options
| author | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
| commit | b4ecf0b886c67437901e0af457c5f801ebde9a72 (patch) | |
| tree | ef66b0684edcfeb4ad68d20375641f4654393f44 /tests/config/test_generate.py | |
| parent | Include the ts the notif was received at (diff) | |
| parent | Merge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff) | |
| download | synapse-b4ecf0b886c67437901e0af457c5f801ebde9a72.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api
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", |