summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2012-10-30 10:27:01 +0800
committerRussell Keith-Magee <russell@keith-magee.com>2012-10-30 10:27:01 +0800
commite784b5e594946acabe1fe41c4d4d7fdc17f4a1cb (patch)
tree768ebfcd081f5574d0c557f16d7136096a60fd23
parent322d858abe8d9090a4e1108c734d9bcebe8ecd8a (diff)
[1.5.X] Added some test guards for some recently added auth tests.
Refs #19061, #19057.
-rw-r--r--django/contrib/auth/tests/handlers.py1
-rw-r--r--django/contrib/auth/tests/models.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/auth/tests/handlers.py b/django/contrib/auth/tests/handlers.py
index a867aae47a..4b36ba3c13 100644
--- a/django/contrib/auth/tests/handlers.py
+++ b/django/contrib/auth/tests/handlers.py
@@ -17,6 +17,7 @@ class ModWsgiHandlerTestCase(TransactionTestCase):
group = Group.objects.create(name='test_group')
user1.groups.add(group)
+ @skipIfCustomUser
def test_check_password(self):
"""
Verify that check_password returns the correct values as per
diff --git a/django/contrib/auth/tests/models.py b/django/contrib/auth/tests/models.py
index cb7d8888fe..ca65dee71b 100644
--- a/django/contrib/auth/tests/models.py
+++ b/django/contrib/auth/tests/models.py
@@ -100,11 +100,13 @@ class UserManagerTestCase(TestCase):
'The given username must be set',
User.objects.create_user, username='')
+
class IsActiveTestCase(TestCase):
"""
Tests the behavior of the guaranteed is_active attribute
"""
+ @skipIfCustomUser
def test_builtin_user_isactive(self):
user = User.objects.create(username='foo', email='foo@bar.com')
# is_active is true by default