summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-13 18:00:23 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-08-13 21:09:47 +0100
commitf4b49152e27593dd6c863e71479a2ab712c4ada2 (patch)
treec34f1fabee9818d6c26152c74ef522061efd46ac /tests/handlers
parentName changelog after PR, not bug (diff)
downloadsynapse-f4b49152e27593dd6c863e71479a2ab712c4ada2.tar.xz
support admin_email config and pass through into blocking errors, return AuthError in all cases
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_register.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index d48d40c8dd..35d1bcab3e 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -17,7 +17,7 @@ from mock import Mock
 
 from twisted.internet import defer
 
-from synapse.api.errors import RegistrationError
+from synapse.api.errors import AuthError
 from synapse.handlers.register import RegistrationHandler
 from synapse.types import UserID, create_requester
 
@@ -109,7 +109,7 @@ class RegistrationTestCase(unittest.TestCase):
         self.store.get_monthly_active_count = Mock(
             return_value=defer.succeed(self.lots_of_users)
         )
-        with self.assertRaises(RegistrationError):
+        with self.assertRaises(AuthError):
             yield self.handler.get_or_create_user("requester", 'b', "display_name")
 
     @defer.inlineCallbacks
@@ -118,7 +118,7 @@ class RegistrationTestCase(unittest.TestCase):
         self.store.get_monthly_active_count = Mock(
             return_value=defer.succeed(self.lots_of_users)
         )
-        with self.assertRaises(RegistrationError):
+        with self.assertRaises(AuthError):
             yield self.handler.register(localpart="local_part")
 
     @defer.inlineCallbacks
@@ -127,5 +127,5 @@ class RegistrationTestCase(unittest.TestCase):
         self.store.get_monthly_active_count = Mock(
             return_value=defer.succeed(self.lots_of_users)
         )
-        with self.assertRaises(RegistrationError):
+        with self.assertRaises(AuthError):
             yield self.handler.register_saml2(localpart="local_part")