summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-03 14:55:54 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-03 14:55:54 +0000
commit66bb255fcd0173ed50a3b1067ac097353512b6a7 (patch)
treed6e60017335d1ab34f8e8d5c2fd6e8e4ad988096 /tests/rest
parentMerge pull request #552 from matrix-org/erikj/public_room_fix (diff)
parentRename config field to reflect yaml name (diff)
downloadsynapse-66bb255fcd0173ed50a3b1067ac097353512b6a7.tar.xz
Merge pull request #556 from matrix-org/daniel/config
Rename config field to reflect yaml name
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v1/test_events.py2
-rw-r--r--tests/rest/client/v2_alpha/test_register.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py
index b260e269ac..e9698bfdc9 100644
--- a/tests/rest/client/v1/test_events.py
+++ b/tests/rest/client/v1/test_events.py
@@ -122,7 +122,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
         self.ratelimiter = hs.get_ratelimiter()
         self.ratelimiter.send_message.return_value = (True, 0)
         hs.config.enable_registration_captcha = False
-        hs.config.disable_registration = False
+        hs.config.enable_registration = True
 
         hs.get_handlers().federation_handler = Mock()
 
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index f9a2b22485..df0841b0b1 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -41,7 +41,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
         self.hs.hostname = "superbig~testing~thing.com"
         self.hs.get_auth = Mock(return_value=self.auth)
         self.hs.get_handlers = Mock(return_value=self.handlers)
-        self.hs.config.disable_registration = False
+        self.hs.config.enable_registration = True
 
         # init the thing we're testing
         self.servlet = RegisterRestServlet(self.hs)
@@ -120,7 +120,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
         }))
 
     def test_POST_disabled_registration(self):
-        self.hs.config.disable_registration = True
+        self.hs.config.enable_registration = False
         self.request_data = json.dumps({
             "username": "kermit",
             "password": "monkey"