From e241b4e7970e45c21d14df30ce9f6f02b9b7cdce Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 25 Sep 2017 08:51:02 -0400 Subject: [2.0.x] Reverted "Fixed #28248 -- Fixed password reset tokens being valid for 1 day longer than PASSWORD_RESET_TIMEOUT_DAYS." This reverts commit 95993a89ce6ca5f5e26b1c22b65c57dcb8c005e9. Backport of 67a6ba391bbcf1a4c6bb0c42cb17e4fc0530f6d2 from master --- tests/auth_tests/test_tokens.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auth_tests') diff --git a/tests/auth_tests/test_tokens.py b/tests/auth_tests/test_tokens.py index 0bc5b07599..ede7b007fa 100644 --- a/tests/auth_tests/test_tokens.py +++ b/tests/auth_tests/test_tokens.py @@ -43,12 +43,10 @@ class TokenGeneratorTest(TestCase): user = User.objects.create_user('tokentestuser', 'test2@example.com', 'testpw') p0 = PasswordResetTokenGenerator() tk1 = p0.make_token(user) - p1 = Mocked(date.today() + timedelta(days=settings.PASSWORD_RESET_TIMEOUT_DAYS, seconds=-1)) + p1 = Mocked(date.today() + timedelta(settings.PASSWORD_RESET_TIMEOUT_DAYS)) self.assertTrue(p1.check_token(user, tk1)) - p2 = Mocked(date.today() + timedelta(days=settings.PASSWORD_RESET_TIMEOUT_DAYS)) + p2 = Mocked(date.today() + timedelta(settings.PASSWORD_RESET_TIMEOUT_DAYS + 1)) self.assertFalse(p2.check_token(user, tk1)) - p3 = Mocked(date.today() + timedelta(days=settings.PASSWORD_RESET_TIMEOUT_DAYS, seconds=1)) - self.assertFalse(p3.check_token(user, tk1)) def test_check_token_with_nonexistent_token_and_user(self): user = User.objects.create_user('tokentestuser', 'test2@example.com', 'testpw') -- cgit v1.3