mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 08:36:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #21756 -- Skipped two timezone-related tests on Windows.

Browse Source 
Windows cannot use a time zone other than the default time zone.

Thanks manfre for the report.
This commit is contained in:
Aymeric Augustin
2014-01-12 09:41:09 +01:00
committed by Anssi Kääriäinen
parent bd5a763bc2
commit c0c480ed40
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/utils_tests/test_dateformat.py
View File

@@ -1,9 +1,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from datetime import datetime, date from datetime import datetime, date
import time
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.test.utils import TZ_SUPPORT, requires_tz_support
from django.utils.dateformat import format from django.utils.dateformat import format
from django.utils import dateformat from django.utils import dateformat
from django.utils.timezone import utc, get_fixed_timezone, get_default_timezone, make_aware from django.utils.timezone import utc, get_fixed_timezone, get_default_timezone, make_aware
@@ -13,9 +13,6 @@ from django.utils import translation
@override_settings(TIME_ZONE='Europe/Copenhagen') @override_settings(TIME_ZONE='Europe/Copenhagen')
class DateFormatTests(TestCase): class DateFormatTests(TestCase):
# Run tests that require a time zone only when the OS supports it.
tz_tests = hasattr(time, 'tzset')
def setUp(self): def setUp(self):
self._orig_lang = translation.get_language() self._orig_lang = translation.get_language()
translation.activate('en-us') translation.activate('en-us')
@@ -31,12 +28,14 @@ class DateFormatTests(TestCase):
dt = datetime(2009, 5, 16, 5, 30, 30) dt = datetime(2009, 5, 16, 5, 30, 30)
self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt) self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt)
@requires_tz_support
def test_datetime_with_local_tzinfo(self): def test_datetime_with_local_tzinfo(self):
ltz = get_default_timezone() ltz = get_default_timezone()
dt = make_aware(datetime(2009, 5, 16, 5, 30, 30), ltz) dt = make_aware(datetime(2009, 5, 16, 5, 30, 30), ltz)
self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt) self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt)
self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt.replace(tzinfo=None)) self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt.replace(tzinfo=None))
@requires_tz_support
def test_datetime_with_tzinfo(self): def test_datetime_with_tzinfo(self):
tz = get_fixed_timezone(-510) tz = get_fixed_timezone(-510)
ltz = get_default_timezone() ltz = get_default_timezone()
@@ -117,7 +116,7 @@ class DateFormatTests(TestCase):
tz = get_fixed_timezone(-210) tz = get_fixed_timezone(-210)
aware_dt = datetime(2009, 5, 16, 5, 30, 30, tzinfo=tz) aware_dt = datetime(2009, 5, 16, 5, 30, 30, tzinfo=tz)
if self.tz_tests: if TZ_SUPPORT:
self.assertEqual(dateformat.format(my_birthday, 'O'), '+0100') self.assertEqual(dateformat.format(my_birthday, 'O'), '+0100')
self.assertEqual(dateformat.format(my_birthday, 'r'), 'Sun, 8 Jul 1979 22:00:00 +0100') self.assertEqual(dateformat.format(my_birthday, 'r'), 'Sun, 8 Jul 1979 22:00:00 +0100')
self.assertEqual(dateformat.format(my_birthday, 'T'), 'CET') self.assertEqual(dateformat.format(my_birthday, 'T'), 'CET')