More fixes

modoboa/admin/api/v2/tests.py

@@ -212,10 +212,11 @@ class AccountViewSetTestCase(ModoAPITestCase):
             "role": "SimpleUsers",
             "mailbox": {"use_domain_quota": True},
             "is_active": True,
+            "password": "Toto1234",
             "aliases": ["alias@test.com"],
         }
         response = self.client.post(reverse("v2:account-list"), values, format="json")
-        self.assertTrue(response.status_code, 201)
+        self.assertEqual(response.status_code, 201)
         self.assertTrue(alias.aliasrecipient_set.count() == 2)
 
     def test_create_admin(self):
@@ -298,7 +299,8 @@ class AccountViewSetTestCase(ModoAPITestCase):
 
     def test_delete_default_superadmin(self):
         """Delete default superadmin."""
-        sadmin2 = core_factories.UserFactory(username="admin2", is_superuser=True)
+        sadmin2 = core_factories.UserFactory(username="admin2")
+        sadmin2.role = "SuperAdmins"
         sadmin = core_models.User.objects.get(username="admin")
         self.authenticate_user(sadmin2)
         response = self.client.post(reverse("v2:account-delete", args=[sadmin.pk]), {})

modoboa/limits/tests/test_user_limits.py

@@ -265,9 +265,7 @@ class ResellerTestCase(ResourceTestCase):
         resp = self._create_account(
             "admin3@domain.tld", role="DomainAdmins", status=400
         )
-        self.assertEqual(
-            resp.json()["role"][0], '"DomainAdmins" is not a valid choice.'
-        )
+        self.assertEqual(resp.json()["role"][0], "Invalid choice")
         self._check_limit("domain_admins", 2, 2)
 
         self.user.userobjectlimit_set.filter(name="mailboxes").update(max_value=3)
@@ -284,9 +282,7 @@ class ResellerTestCase(ResourceTestCase):
             reverse("v2:account-detail", args=[user.id]), values, format="json"
         )
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(
-            response.json()["role"][0], '"DomainAdmins" is not a valid choice.'
-        )
+        self.assertEqual(response.json()["role"][0], "Invalid choice")
         self._check_limit("domain_admins", 2, 2)
 
     def test_domain_admin_resource_are_empty(self):

modoboa/relaydomains/tests.py

@@ -274,7 +274,7 @@ class LimitsTestCase(ModoAPITestCase, Operations):
         self._check_limit("domains", 1, 2)
         self._create_relay_domain("relaydomain2.tld", quota=1, default_mailbox_quota=1)
         self._check_limit("domains", 2, 2)
-        self._create_relay_domain("relaydomain3.tld", 403)
+        self._create_relay_domain("relaydomain3.tld", 400)
         self._check_limit("domains", 2, 2)
         domid = admin_models.Domain.objects.get(name="relaydomain2.tld").id
         url = reverse("v2:domain-delete", args=[domid])

test_project/test_project/settings.py

@@ -232,11 +232,11 @@ OAUTH2_PROVIDER = {
 
 REST_FRAMEWORK = {
     "DEFAULT_THROTTLE_RATES": {
-        "user": "200/minute",
+        "user": "400/minute",
         "ddos": "10/second",
         "ddos_lesser": "200/minute",
         "login": "10/minute",
-        "password_recovery_request": "11/hour",
+        "password_recovery_request": "12/hour",
         "password_recovery_totp_check": "25/hour",
         "password_recovery_apply": "25/hour",
     },