summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-02-23 11:59:40 +0000
committerMark Haines <mjark@negativecurvature.net>2016-02-23 11:59:40 +0000
commit10d581d1cf7b9ab14ea8525a9f30a4d3a153de67 (patch)
tree68e51f54fb4873b79177ccd74e87149aafbf5a0e /tests
parentPick up currently_active across federation (diff)
parentCheck that the disable_registration config key is handled correctly (diff)
downloadsynapse-10d581d1cf7b9ab14ea8525a9f30a4d3a153de67.tar.xz
Merge pull request #595 from matrix-org/markjh/coverage
Check that the disable_registration config key is handled correctly
Diffstat (limited to 'tests')
-rw-r--r--tests/config/test_load.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py
index fbbbf93fef..bf46233c5c 100644
--- a/tests/config/test_load.py
+++ b/tests/config/test_load.py
@@ -60,6 +60,22 @@ class ConfigLoadingTestCase(unittest.TestCase):
         config2 = HomeServerConfig.load_config("", ["-c", self.file])
         self.assertEqual(config1.macaroon_secret_key, config2.macaroon_secret_key)
 
+    def test_disable_registration(self):
+        self.generate_config()
+        self.add_lines_to_config([
+            "enable_registration: true",
+            "disable_registration: true",
+        ])
+        # Check that disable_registration clobbers enable_registration.
+        config = HomeServerConfig.load_config("", ["-c", self.file])
+        self.assertFalse(config.enable_registration)
+
+        # Check that either config value is clobbered by the command line.
+        config = HomeServerConfig.load_config("", [
+            "-c", self.file, "--enable-registration"
+        ])
+        self.assertTrue(config.enable_registration)
+
     def generate_config(self):
         HomeServerConfig.load_config("", [
             "--generate-config",
@@ -76,3 +92,8 @@ class ConfigLoadingTestCase(unittest.TestCase):
         contents = [l for l in contents if needle not in l]
         with open(self.file, "w") as f:
             f.write("".join(contents))
+
+    def add_lines_to_config(self, lines):
+        with open(self.file, "a") as f:
+            for line in lines:
+                f.write(line + "\n")