diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-12-10 13:37:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-12-10 13:37:53 (GMT) |
| commit | 10a6ddb062251177ee5458f5c07b7bbec5534bc1 (patch) | |
| tree | 676aad894afb61075228375cac934a7733b36e06 /Lib/test | |
| parent | 1635e9cc59938573f95048128abb4c19317d8998 (diff) | |
| download | cpython-10a6ddb062251177ee5458f5c07b7bbec5534bc1.zip cpython-10a6ddb062251177ee5458f5c07b7bbec5534bc1.tar.gz cpython-10a6ddb062251177ee5458f5c07b7bbec5534bc1.tar.bz2 | |
Issue #11886: Fix also test_time for the non-DST timezone name (EST/AEST)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_time.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index cc5de21..a73588c 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -252,11 +252,13 @@ class TimeTestCase(unittest.TestCase): self.assertNotEqual(time.gmtime(xmas2002), time.localtime(xmas2002)) # Issue #11886: Australian Eastern Standard Time (UTC+10) is called - # "EST" (as Eastern Standard Time, UTC-5) instead of "AEST" on some - # operating systems (e.g. FreeBSD), which is wrong. See for example - # this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=93810 + # "EST" (as Eastern Standard Time, UTC-5) instead of "AEST" + # (non-DST timezone), and "EDT" instead of "AEDT" (DST timezone), + # on some operating systems (e.g. FreeBSD), which is wrong. See for + # example this bug: + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=93810 self.assertIn(time.tzname[0], ('AEST' 'EST'), time.tzname[0]) - self.assertTrue(time.tzname[1] == 'AEDT', str(time.tzname[1])) + self.assertTrue(time.tzname[1] in ('AEDT', 'EDT'), str(time.tzname[1])) self.assertEqual(len(time.tzname), 2) self.assertEqual(time.daylight, 1) self.assertEqual(time.timezone, -36000) |