summary refs log tree commit diff
path: root/tests/api/test_auth.py
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/api/test_auth.py
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/api/test_auth.py')
-rw-r--r--tests/api/test_auth.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
index a65689ba89..e8a1894e65 100644
--- a/tests/api/test_auth.py
+++ b/tests/api/test_auth.py
@@ -455,8 +455,11 @@ class AuthTestCase(unittest.TestCase):
             return_value=defer.succeed(lots_of_users)
         )
 
-        with self.assertRaises(AuthError):
+        with self.assertRaises(AuthError) as e:
             yield self.auth.check_auth_blocking()
+        self.assertEquals(e.exception.admin_email, self.hs.config.admin_email)
+        self.assertEquals(e.exception.errcode, Codes.MAU_LIMIT_EXCEEDED)
+        self.assertEquals(e.exception.code, 403)
 
         # Ensure does not throw an error
         self.store.get_monthly_active_count = Mock(
@@ -470,5 +473,6 @@ class AuthTestCase(unittest.TestCase):
         self.hs.config.hs_disabled_message = "Reason for being disabled"
         with self.assertRaises(AuthError) as e:
             yield self.auth.check_auth_blocking()
+        self.assertEquals(e.exception.admin_email, self.hs.config.admin_email)
         self.assertEquals(e.exception.errcode, Codes.HS_DISABLED)
         self.assertEquals(e.exception.code, 403)