summary refs log tree commit diff
path: root/tests/config/test_generate.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-11-06 11:59:22 -0500
committerHubert Chathi <hubert@uhoreg.ca>2019-11-06 11:59:22 -0500
commita5a59ab8ac6d6b244158261ee4d307d419b20180 (patch)
treed809f7205647c13b93a103727dab6f4a19c878e4 /tests/config/test_generate.py
parentfix merge conflict (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-a5a59ab8ac6d6b244158261ee4d307d419b20180.tar.xz
Merge branch 'develop' into uhoreg/e2e_backup_hash
Diffstat (limited to 'tests/config/test_generate.py')
-rw-r--r--tests/config/test_generate.py25
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/config/test_generate.py b/tests/config/test_generate.py
index 5017cbce85..2684e662de 100644
--- a/tests/config/test_generate.py
+++ b/tests/config/test_generate.py
@@ -17,6 +17,8 @@ import os.path
 import re
 import shutil
 import tempfile
+from contextlib import redirect_stdout
+from io import StringIO
 
 from synapse.config.homeserver import HomeServerConfig
 
@@ -32,17 +34,18 @@ class ConfigGenerationTestCase(unittest.TestCase):
         shutil.rmtree(self.dir)
 
     def test_generate_config_generates_files(self):
-        HomeServerConfig.load_or_generate_config(
-            "",
-            [
-                "--generate-config",
-                "-c",
-                self.file,
-                "--report-stats=yes",
-                "-H",
-                "lemurs.win",
-            ],
-        )
+        with redirect_stdout(StringIO()):
+            HomeServerConfig.load_or_generate_config(
+                "",
+                [
+                    "--generate-config",
+                    "-c",
+                    self.file,
+                    "--report-stats=yes",
+                    "-H",
+                    "lemurs.win",
+                ],
+            )
 
         self.assertSetEqual(
             set(["homeserver.yaml", "lemurs.win.log.config", "lemurs.win.signing.key"]),