summaryrefslogtreecommitdiff
path: root/tests/utils_tests
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-05-03 09:08:37 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-05-17 10:23:14 +0200
commit06dc6759d85c6c24b599de07cea47387d3dc2cf9 (patch)
tree2efaa03afd364fe4558ac593c2bd3cb1a5b9dd70 /tests/utils_tests
parentda2c6959c8da20ff9e4ebc5e68e2be44930116cd (diff)
downloaddjango-06dc6759d85c6c24b599de07cea47387d3dc2cf9.tar.gz
Factored skip condition when pytz isn't installed.
Diffstat (limited to 'tests/utils_tests')
-rw-r--r--tests/utils_tests/test_timezone.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py
index 55158bfeaa..2bd87cc932 100644
--- a/tests/utils_tests/test_timezone.py
+++ b/tests/utils_tests/test_timezone.py
@@ -11,6 +11,8 @@ try:
except ImportError:
pytz = None
+requires_pytz = unittest.skipIf(pytz is None, "this test requires pytz")
+
if pytz is not None:
CET = pytz.timezone("Europe/Paris")
EAT = timezone.get_fixed_timezone(180) # Africa/Nairobi
@@ -137,7 +139,7 @@ class TimezoneTests(unittest.TestCase):
with self.assertRaises(ValueError):
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT)
- @unittest.skipIf(pytz is None, "this test requires pytz")
+ @requires_pytz
def test_make_aware2(self):
self.assertEqual(
timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30), CET),
@@ -145,7 +147,7 @@ class TimezoneTests(unittest.TestCase):
with self.assertRaises(ValueError):
timezone.make_aware(CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET)
- @unittest.skipIf(pytz is None, "this test requires pytz")
+ @requires_pytz
def test_make_aware_pytz(self):
self.assertEqual(
timezone.make_naive(CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET),
@@ -156,7 +158,7 @@ class TimezoneTests(unittest.TestCase):
with self.assertRaises(ValueError):
timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30), CET)
- @unittest.skipIf(pytz is None, "this test requires pytz")
+ @requires_pytz
def test_make_aware_pytz_ambiguous(self):
# 2:30 happens twice, once before DST ends and once after
ambiguous = datetime.datetime(2015, 10, 25, 2, 30)
@@ -170,7 +172,7 @@ class TimezoneTests(unittest.TestCase):
self.assertEqual(std.tzinfo.utcoffset(std), datetime.timedelta(hours=1))
self.assertEqual(dst.tzinfo.utcoffset(dst), datetime.timedelta(hours=2))
- @unittest.skipIf(pytz is None, "this test requires pytz")
+ @requires_pytz
def test_make_aware_pytz_non_existent(self):
# 2:30 never happened due to DST
non_existent = datetime.datetime(2015, 3, 29, 2, 30)