Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 22:14:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"

Browse source 
This reverts commit 0d43f991a1.
This commit is contained in:
Neil Johnson 2018-08-13 18:06:18 +01:00
parent 0d43f991a1
commit ce7de9ae6b
7 changed files with 22 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/api/test_auth.py
View file

@ -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)