diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-10-04 21:55:16 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-10-05 18:50:20 +0200 |
| commit | 671757b507a60330ee37ef749a3f3a0301258f88 (patch) | |
| tree | 3172c91eef30c6ed2cef9e56290204cde7ad0344 /tests/utils_tests | |
| parent | ecaba3602837d1e02fe1e961f7d3bf9086453259 (diff) | |
Fixed #21161 -- Timezone-related tests on Windows.
Thanks Xelnor for the patch.
Diffstat (limited to 'tests/utils_tests')
| -rw-r--r-- | tests/utils_tests/test_timesince.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/utils_tests/test_timesince.py b/tests/utils_tests/test_timesince.py index b454131b2d..5814a7cb90 100644 --- a/tests/utils_tests/test_timesince.py +++ b/tests/utils_tests/test_timesince.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import datetime import unittest +from django.test.utils import requires_tz_support from django.utils.timesince import timesince, timeuntil from django.utils import timezone @@ -93,6 +94,7 @@ class TimesinceTests(unittest.TestCase): self.assertEqual(timesince(self.t, self.t-4*self.oneday-5*self.oneminute), '0\xa0minutes') + @requires_tz_support def test_different_timezones(self): """ When using two different timezones. """ now = datetime.datetime.now() @@ -101,6 +103,11 @@ class TimesinceTests(unittest.TestCase): self.assertEqual(timesince(now), '0\xa0minutes') self.assertEqual(timesince(now_tz), '0\xa0minutes') + self.assertEqual(timesince(now_tz_i), '0\xa0minutes') + self.assertEqual(timesince(now_tz, now_tz_i), '0\xa0minutes') + self.assertEqual(timeuntil(now), '0\xa0minutes') + self.assertEqual(timeuntil(now_tz), '0\xa0minutes') + self.assertEqual(timeuntil(now_tz_i), '0\xa0minutes') self.assertEqual(timeuntil(now_tz, now_tz_i), '0\xa0minutes') def test_date_objects(self): |
