summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-10-14 10:11:18 +0200
committerClaude Paroz <claude@2xlibre.net>2013-10-14 10:17:51 +0200
commit4a9bae0b39aebdedf38fcb760405c04b8216c508 (patch)
treea6411a63b4358a233732691e87d9d2e9ca7d02ad
parent5591fe6829c458346982e39e777f1fdca69e9792 (diff)
[1.6.x] Imported custom user classes in tests depending on it
Without those imports, affected test files cannot be run independently. Refs #21164. Backport of ef22d512b5 from master.
-rw-r--r--django/contrib/auth/tests/test_models.py1
-rw-r--r--django/contrib/auth/tests/test_views.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/auth/tests/test_models.py b/django/contrib/auth/tests/test_models.py
index b0a4559b42..d5bf91dfc8 100644
--- a/django/contrib/auth/tests/test_models.py
+++ b/django/contrib/auth/tests/test_models.py
@@ -4,6 +4,7 @@ from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.models import (Group, User, SiteProfileNotAvailable,
UserManager)
+from django.contrib.auth.tests.custom_user import IsActiveTestUser1
from django.contrib.auth.tests.utils import skipIfCustomUser
from django.db.models.signals import post_save
from django.test import TestCase
diff --git a/django/contrib/auth/tests/test_views.py b/django/contrib/auth/tests/test_views.py
index 9c0772190d..ba07a70903 100644
--- a/django/contrib/auth/tests/test_views.py
+++ b/django/contrib/auth/tests/test_views.py
@@ -21,6 +21,7 @@ from django.contrib.sessions.middleware import SessionMiddleware
from django.contrib.auth import SESSION_KEY, REDIRECT_FIELD_NAME
from django.contrib.auth.forms import (AuthenticationForm, PasswordChangeForm,
SetPasswordForm)
+from django.contrib.auth.tests.custom_user import CustomUser
from django.contrib.auth.tests.utils import skipIfCustomUser
from django.contrib.auth.views import login as login_view