diff options
| author | Tim Graham <timograham@gmail.com> | 2016-01-04 19:08:21 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-05 13:12:27 -0500 |
| commit | df4fea644f65f791797c2e01e23a6c303396256d (patch) | |
| tree | 63ff6a573000bfec6b97729c5ff0f98bee44b7ca /tests/utils_tests | |
| parent | 4164a4e1666491f346d729370f87ab5d5973297e (diff) | |
[1.8.x] Skipped a dateformat test on Windows as needed.
Refs 1014ba026e879e56e0f265a8d9f54e6f39843348
Backport of 2765adc8dcbaa41662af9000c4de2820418bf0a2 from master
Diffstat (limited to 'tests/utils_tests')
| -rw-r--r-- | tests/utils_tests/test_dateformat.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/utils_tests/test_dateformat.py b/tests/utils_tests/test_dateformat.py index 61859fbaec..af37b28b36 100644 --- a/tests/utils_tests/test_dateformat.py +++ b/tests/utils_tests/test_dateformat.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals +import sys from datetime import date, datetime +from unittest import skipIf from django.test import TestCase, override_settings from django.test.utils import TZ_SUPPORT, requires_tz_support @@ -34,6 +36,7 @@ class DateFormatTests(TestCase): dt = datetime(2009, 5, 16, 5, 30, 30) self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt) + @skipIf(sys.platform.startswith('win') and not pytz, "Test requires pytz on Windows") def test_naive_ambiguous_datetime(self): # dt is ambiguous in Europe/Copenhagen. LocalTimezone guesses the # offset (and gets it wrong 50% of the time) while pytz refuses the |