innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed duplicate-named contrib.sessions tests, and removed unused import (cleanup from doctest conversion). 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2011-01-31 18:37:28 +00:00
parent f3a9c719fe
commit b8a8066ac4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/sessions/tests.py
View File

@ -9,7 +9,6 @@ from django.contrib.sessions.backends.db import SessionStore as DatabaseSession
from django.contrib.sessions.backends.cache import SessionStore as CacheSession from django.contrib.sessions.backends.cache import SessionStore as CacheSession
from django.contrib.sessions.backends.cached_db import SessionStore as CacheDBSession from django.contrib.sessions.backends.cached_db import SessionStore as CacheDBSession
from django.contrib.sessions.backends.file import SessionStore as FileSession from django.contrib.sessions.backends.file import SessionStore as FileSession
from django.contrib.sessions.backends.base import SessionBase
from django.contrib.sessions.models import Session from django.contrib.sessions.models import Session
from django.contrib.sessions.middleware import SessionMiddleware from django.contrib.sessions.middleware import SessionMiddleware
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -100,7 +99,7 @@ class SessionTestsMixin(object):
self.assertFalse(self.session.modified) self.assertFalse(self.session.modified)
self.assertEqual(list(i), ['x']) self.assertEqual(list(i), ['x'])
def test_iterkeys(self): def test_itervalues(self):
self.session['x'] = 1 self.session['x'] = 1
self.session.modified = False self.session.modified = False
self.session.accessed = False self.session.accessed = False
@ -199,8 +198,8 @@ class SessionTestsMixin(object):
age = self.session.get_expiry_age() age = self.session.get_expiry_age()
self.assertTrue(age in (9, 10)) self.assertTrue(age in (9, 10))
def test_custom_expiry_timedelta(self): def test_custom_expiry_datetime(self):
# Using timedelta # Using fixed datetime
self.session.set_expiry(datetime.now() + timedelta(seconds=10)) self.session.set_expiry(datetime.now() + timedelta(seconds=10))
delta = self.session.get_expiry_date() - datetime.now() delta = self.session.get_expiry_date() - datetime.now()
self.assertTrue(delta.seconds in (9, 10)) self.assertTrue(delta.seconds in (9, 10))