diff --git a/openwisp_users/tests/test_admin.py b/openwisp_users/tests/test_admin.py index f5568a78..81f0b3f7 100644 --- a/openwisp_users/tests/test_admin.py +++ b/openwisp_users/tests/test_admin.py @@ -5,7 +5,7 @@ from unittest.mock import patch import django -from django.contrib import admin +from django.contrib import admin as django_admin from django.contrib.auth import REDIRECT_FIELD_NAME, get_user_model from django.contrib.auth.models import Permission from django.core import mail @@ -1967,7 +1967,7 @@ def test_class_attr_regression(self): class TestAdmin(MultitenantAdminMixin): multitenant_parent = "test" - owner_admin = OrganizationOwnerAdmin(Organization, admin.site) + owner_admin = OrganizationOwnerAdmin(Organization, django_admin.site) test_admin = TestAdmin() with self.subTest("multitenant_parent added to multitenant_shared_relations"): diff --git a/requirements.txt b/requirements.txt index b25fe672..39762c30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ django-organizations~=2.5.0 django-extensions>=3.2,<4.2 -django-allauth[socialaccount]~=65.8.1 +django-allauth[socialaccount]>=65.12.0,<65.13.0 django-phonenumber-field~=8.1.0 phonenumbers~=9.0.10 openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 diff --git a/tests/openwisp2/settings.py b/tests/openwisp2/settings.py index 1cefe27f..a02f2d64 100644 --- a/tests/openwisp2/settings.py +++ b/tests/openwisp2/settings.py @@ -162,6 +162,9 @@ LOGIN_REDIRECT_URL = "admin:index" ACCOUNT_EMAIL_CONFIRMATION_ANONYMOUS_REDIRECT_URL = "email_confirmation_success" ACCOUNT_EMAIL_CONFIRMATION_AUTHENTICATED_REDIRECT_URL = "email_confirmation_success" +# disable allauth ratelimiting during automated tests +if TESTING: + ACCOUNT_RATE_LIMITS = False if not PARALLEL: CACHES = {