summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-12-07 23:32:51 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-12-07 23:32:51 (GMT)
commit0cd479074d3e607e81661e73440eff87264cf737 (patch)
treeb6f158ff213959103bae909d8406939a2e0d9f9d /Lib/test
parenteb5879414dd76f9b1ad4cac5114387951fbbf153 (diff)
downloadcpython-0cd479074d3e607e81661e73440eff87264cf737.zip
cpython-0cd479074d3e607e81661e73440eff87264cf737.tar.gz
cpython-0cd479074d3e607e81661e73440eff87264cf737.tar.bz2
Issue #11886: workaround an OS bug (time zone data) in test_time
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
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_time.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 8499af8..ce57d87 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -206,7 +206,12 @@ class TimeTestCase(unittest.TestCase):
environ['TZ'] = victoria
time.tzset()
self.assertNotEqual(time.gmtime(xmas2002), time.localtime(xmas2002))
- self.assertTrue(time.tzname[0] == 'AEST', str(time.tzname[0]))
+
+ # 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
+ self.assertIn(time.tzname[0], ('AEST' 'EST'), time.tzname[0])
self.assertTrue(time.tzname[1] == 'AEDT', str(time.tzname[1]))
self.assertEqual(len(time.tzname), 2)
self.assertEqual(time.daylight, 1)