diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2009-11-01 23:52:31 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2009-11-01 23:52:31 +0000 |
| commit | e114f4403a2e0f49de10cb8bd2fde90f4693c2c1 (patch) | |
| tree | 6e28e967c3cfd86bc1378d0d0a70aaaeb35fc7f2 | |
| parent | 13d83908a4fa15570c265d310f2ecc4295bd7411 (diff) | |
[1.1.X] Repeat the setUp/tearDown changes made in r11699 for the tests
converted in r11694. This allows the dateformat tests to pass
on Windows.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/dateformat/tests.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/regressiontests/dateformat/tests.py b/tests/regressiontests/dateformat/tests.py index 93418d2f63..3a19d26e19 100644 --- a/tests/regressiontests/dateformat/tests.py +++ b/tests/regressiontests/dateformat/tests.py @@ -5,12 +5,15 @@ import datetime, os, time class DateFormatTests(TestCase): def setUp(self): - self.old_TZ = os.environ['TZ'] + self.old_TZ = os.environ.get('TZ') os.environ['TZ'] = 'Europe/Copenhagen' translation.activate('en-us') def tearDown(self): - os.environ['TZ'] = self.old_TZ + if self.old_TZ is None: + del os.environ['TZ'] + else: + os.environ['TZ'] = self.old_TZ def test_empty_format(self): my_birthday = datetime.datetime(1979, 7, 8, 22, 00) @@ -80,4 +83,4 @@ class DateFormatTests(TestCase): self.assertEquals(dateformat.format(wintertime, 'O'), u'+0100') except AttributeError: # No timezone available. Don't run the tests - pass
\ No newline at end of file + pass |