summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-08-03 22:29:03 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-08-03 22:29:03 +0100
commit886be75ad1bc60e016611b453b9644e8db17a9f1 (patch)
treee9989d64ec1c4af92ffdd00c6651145510aafbbe /tests
parentwip commit - tests failing (diff)
downloadsynapse-886be75ad1bc60e016611b453b9644e8db17a9f1.tar.xz
bug fixes
Diffstat (limited to 'tests')
-rw-r--r--tests/api/test_auth.py10
-rw-r--r--tests/handlers/test_register.py1
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py

index 54bdf28663..e963963c73 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py
@@ -452,12 +452,8 @@ class AuthTestCase(unittest.TestCase): lots_of_users = 100 small_number_of_users = 1 - error = AuthError( - 403, "MAU Limit Exceeded", errcode=Codes.MAU_LIMIT_EXCEEDED - ) - # Ensure no error thrown - yield self.auth.check_auth_blocking(error) + yield self.auth.check_auth_blocking() self.hs.config.limit_usage_by_mau = True @@ -466,10 +462,10 @@ class AuthTestCase(unittest.TestCase): ) with self.assertRaises(AuthError): - yield self.auth.check_auth_blocking(error) + yield self.auth.check_auth_blocking() # Ensure does not throw an error self.store.get_monthly_active_count = Mock( return_value=defer.succeed(small_number_of_users) ) - yield self.auth.check_auth_blocking(error) + yield self.auth.check_auth_blocking() diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index 6b5b8b3772..4ea59a58de 100644 --- a/tests/handlers/test_register.py +++ b/tests/handlers/test_register.py
@@ -104,7 +104,6 @@ class RegistrationTestCase(unittest.TestCase): self.store.get_monthly_active_count = Mock( return_value=defer.succeed(self.lots_of_users) ) - with self.assertRaises(RegistrationError): yield self.handler.get_or_create_user("requester", 'b', "display_name")