From 927f43ea3add3cf92856c447bb021b59b22603df Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Fri, 12 Feb 2016 08:54:23 +0200 Subject: [PATCH] [1.8.x] Fixed #26126 -- Fixed transient failure of test_max_age_expiration Backport of b17a9150a0c3a132e82b53755ede62a45f897875 from master --- tests/requests/tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/requests/tests.py b/tests/requests/tests.py index b0598b1cc0..17dd770f0d 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -14,7 +14,7 @@ from django.http import ( ) from django.test import RequestFactory, SimpleTestCase, override_settings from django.test.client import FakePayload -from django.test.utils import str_prefix +from django.test.utils import freeze_time, str_prefix from django.utils import six from django.utils.encoding import force_str from django.utils.http import cookie_date, urlencode @@ -213,10 +213,12 @@ class RequestsTests(SimpleTestCase): def test_max_age_expiration(self): "Cookie will expire if max_age is provided" response = HttpResponse() - response.set_cookie('max_age', max_age=10) + set_cookie_time = time.time() + with freeze_time(set_cookie_time): + response.set_cookie('max_age', max_age=10) max_age_cookie = response.cookies['max_age'] self.assertEqual(max_age_cookie['max-age'], 10) - self.assertEqual(max_age_cookie['expires'], cookie_date(time.time() + 10)) + self.assertEqual(max_age_cookie['expires'], cookie_date(set_cookie_time + 10)) def test_httponly_cookie(self): response = HttpResponse()