summary refs log tree commit diff
path: root/tests/config/test_generate.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-07 13:14:45 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-09-07 13:14:45 -0400
commit0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec (patch)
tree9dccb1711608f8c0b3a6dcd22eaa6f100c7a4e17 /tests/config/test_generate.py
parentuse something that's the right type for user_id (diff)
parentServers-known-about statistic (#5981) (diff)
downloadsynapse-0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec.tar.xz
Merge branch 'develop' into cross-signing_sig_upload
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"]),