Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed #26126 -- Fixed transient failure of test_max_age_expiration

Browse Source 
Backport of b17a9150a0c3a132e82b53755ede62a45f897875 from master
This commit is contained in:
Berker Peksag 2016-02-12 08:54:23 +02:00 committed by Tim Graham
parent b9105e7dea
commit 927f43ea3a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/requests/tests.py
View File

@ -14,7 +14,7 @@ from django.http import (
) )
from django.test import RequestFactory, SimpleTestCase, override_settings from django.test import RequestFactory, SimpleTestCase, override_settings
from django.test.client import FakePayload 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 import six
from django.utils.encoding import force_str from django.utils.encoding import force_str
from django.utils.http import cookie_date, urlencode from django.utils.http import cookie_date, urlencode
@ -213,10 +213,12 @@ class RequestsTests(SimpleTestCase):
def test_max_age_expiration(self): def test_max_age_expiration(self):
"Cookie will expire if max_age is provided" "Cookie will expire if max_age is provided"
response = HttpResponse() response = HttpResponse()
set_cookie_time = time.time()
with freeze_time(set_cookie_time):
response.set_cookie('max_age', max_age=10) response.set_cookie('max_age', max_age=10)
max_age_cookie = response.cookies['max_age'] max_age_cookie = response.cookies['max_age']
self.assertEqual(max_age_cookie['max-age'], 10) 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): def test_httponly_cookie(self):
response = HttpResponse() response = HttpResponse()