mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

[1.1.X] Fixed #12127 -- Corrected teardown of dateformat tests. Thanks to apollo13 for the report, and Karen Tracey for the debugging help.

Browse Source 
Backport of r11705 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-11-02 08:27:00 +00:00
parent 30ebd268be
commit e3f07d2b4c
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/regressiontests/dateformat/tests.py
View File

@ -9,12 +9,24 @@ class DateFormatTests(TestCase):
os.environ['TZ'] = 'Europe/Copenhagen' os.environ['TZ'] = 'Europe/Copenhagen'
translation.activate('en-us') translation.activate('en-us')
try:
# Check if a timezone has been set
time.tzset()
self.tz_tests = True
except AttributeError:
# No timezone available. Don't run the tests that require a TZ
self.tz_tests = False
def tearDown(self): def tearDown(self):
if self.old_TZ is None: if self.old_TZ is None:
del os.environ['TZ'] del os.environ['TZ']
else: else:
os.environ['TZ'] = self.old_TZ os.environ['TZ'] = self.old_TZ
# Cleanup - force re-evaluation of TZ environment variable.
if self.tz_tests:
time.tzset()
def test_empty_format(self): def test_empty_format(self):
my_birthday = datetime.datetime(1979, 7, 8, 22, 00) my_birthday = datetime.datetime(1979, 7, 8, 22, 00)
@ -68,10 +80,7 @@ class DateFormatTests(TestCase):
summertime = datetime.datetime(2005, 10, 30, 1, 00) summertime = datetime.datetime(2005, 10, 30, 1, 00)
wintertime = datetime.datetime(2005, 10, 30, 4, 00) wintertime = datetime.datetime(2005, 10, 30, 4, 00)
try: if self.tz_tests:
# Check if a timezone has been set
time.tzset()
self.assertEquals(dateformat.format(my_birthday, 'O'), u'+0100') self.assertEquals(dateformat.format(my_birthday, 'O'), u'+0100')
self.assertEquals(dateformat.format(my_birthday, 'r'), u'Sun, 8 Jul 1979 22:00:00 +0100') self.assertEquals(dateformat.format(my_birthday, 'r'), u'Sun, 8 Jul 1979 22:00:00 +0100')
self.assertEquals(dateformat.format(my_birthday, 'T'), u'CET') self.assertEquals(dateformat.format(my_birthday, 'T'), u'CET')
@ -81,6 +90,3 @@ class DateFormatTests(TestCase):
self.assertEquals(dateformat.format(summertime, 'O'), u'+0200') self.assertEquals(dateformat.format(summertime, 'O'), u'+0200')
self.assertEquals(dateformat.format(wintertime, 'I'), u'0') self.assertEquals(dateformat.format(wintertime, 'I'), u'0')
self.assertEquals(dateformat.format(wintertime, 'O'), u'+0100') self.assertEquals(dateformat.format(wintertime, 'O'), u'+0100')
except AttributeError:
# No timezone available. Don't run the tests
pass

10
tests/regressiontests/utils/dateformat.py
View File

@ -5,16 +5,6 @@ from django.utils.dateformat import format
from django.utils.tzinfo import FixedOffset, LocalTimezone from django.utils.tzinfo import FixedOffset, LocalTimezone
class DateFormatTests(TestCase): class DateFormatTests(TestCase):
def setUp(self):
self.old_TZ = os.environ.get('TZ')
os.environ['TZ'] = 'Europe/Copenhagen'
def tearDown(self):
if self.old_TZ is None:
del os.environ['TZ']
else:
os.environ['TZ'] = self.old_TZ
def test_date(self): def test_date(self):
d = date(2009, 5, 16) d = date(2009, 5, 16)
self.assertEquals(date.fromtimestamp(int(format(d, 'U'))), d) self.assertEquals(date.fromtimestamp(int(format(d, 'U'))), d)