summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-07-30 16:14:53 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-07-30 16:18:44 +0200
commit88e4a3a3d932997aabebba772217f954df2fd65b (patch)
tree8a3497e9ecf822df3de5b9de739af3e8e3962ee0
parent17e632929cdf9575f538c1f98379adac8698c288 (diff)
[1.6.x] Fixed a test that could fail depending on PASSWORD_HASHERS.
Thanks Claude. Refs #20760. Backport of 5b47a9c5a0dcb513dc5ff68b617b3aa374c90f3b from master.
-rw-r--r--django/contrib/auth/tests/test_auth_backends.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/auth/tests/test_auth_backends.py b/django/contrib/auth/tests/test_auth_backends.py
index b48df91cfb..4e83d786cf 100644
--- a/django/contrib/auth/tests/test_auth_backends.py
+++ b/django/contrib/auth/tests/test_auth_backends.py
@@ -125,6 +125,10 @@ class BaseModelBackendTest(object):
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.tests.test_auth_backends.CountingMD5PasswordHasher',))
def test_authentication_timing(self):
"""Hasher is run once regardless of whether the user exists. Refs #20760."""
+ # Re-set the password, because this tests overrides PASSWORD_HASHERS
+ self.user.set_password('test')
+ self.user.save()
+
CountingMD5PasswordHasher.calls = 0
username = getattr(self.user, self.UserModel.USERNAME_FIELD)
authenticate(username=username, password='test')