summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-01-31 19:47:40 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-01-31 19:47:40 +0000
commitc82f1dcf95d4ecdc7e020a4715fbb1b097a6a796 (patch)
treeeb7d83a12b1d5c59b4941493ac610ab390ead966 /tests
parenta678e9ea6589bd95d9d30e86a50d3694ebf60908 (diff)
Skipped the test introduced at r17403 on Python 2.5, because it requires warnings.catch_warnings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/timezones/tests.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/modeltests/timezones/tests.py b/tests/modeltests/timezones/tests.py
index 3954bc3392..dc9cfb3fd1 100644
--- a/tests/modeltests/timezones/tests.py
+++ b/tests/modeltests/timezones/tests.py
@@ -262,6 +262,7 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
@requires_tz_support
+ @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
def test_datetime_from_date(self):
dt = datetime.date(2011, 9, 1)
with warnings.catch_warnings(record=True) as recorded: