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:06:18 +0100
committerNeil Johnson <neil@matrix.org>2018-08-13 18:06:18 +0100
commitce7de9ae6b74e8e5e89ff442bc29f8cd73328042 (patch)
tree31fff38e9be8ffb8d4407b02cdf9a07247a11f1b /tests/api/test_auth.py
parentsupport admin_email config and pass through into blocking errors, return Auth... (diff)
downloadsynapse-ce7de9ae6b74e8e5e89ff442bc29f8cd73328042.tar.xz
Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"
This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6.
Diffstat (limited to 'tests/api/test_auth.py')
-rw-r--r--tests/api/test_auth.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
index e8a1894e65..a65689ba89 100644
--- a/tests/api/test_auth.py
+++ b/tests/api/test_auth.py
@@ -455,11 +455,8 @@ class AuthTestCase(unittest.TestCase):
             return_value=defer.succeed(lots_of_users)
         )
 
-        with self.assertRaises(AuthError) as e:
+        with self.assertRaises(AuthError):
             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(
@@ -473,6 +470,5 @@ 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)