Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed duplicate-named contrib.sessions tests, and removed unused impo…

…rt (cleanup from doctest conversion).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b8a8066ac47b50316a14b88f1e3fb236bc03576f 1 parent f3a9c71
Carl Meyer carljm authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 django/contrib/sessions/tests.py
7 django/contrib/sessions/tests.py
View
@@ -9,7 +9,6 @@
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.file import SessionStore as FileSession
-from django.contrib.sessions.backends.base import SessionBase
from django.contrib.sessions.models import Session
from django.contrib.sessions.middleware import SessionMiddleware
from django.core.exceptions import ImproperlyConfigured
@@ -100,7 +99,7 @@ def test_iterkeys(self):
self.assertFalse(self.session.modified)
self.assertEqual(list(i), ['x'])
- def test_iterkeys(self):
+ def test_itervalues(self):
self.session['x'] = 1
self.session.modified = False
self.session.accessed = False
@@ -199,8 +198,8 @@ def test_custom_expiry_timedelta(self):
age = self.session.get_expiry_age()
self.assertTrue(age in (9, 10))
- def test_custom_expiry_timedelta(self):
- # Using timedelta
+ def test_custom_expiry_datetime(self):
+ # Using fixed datetime
self.session.set_expiry(datetime.now() + timedelta(seconds=10))
delta = self.session.get_expiry_date() - datetime.now()
self.assertTrue(delta.seconds in (9, 10))
Please sign in to comment.
Something went wrong with that request. Please try again.