[Python-checkins] cpython: Replace temporary tests with the real test case for issue #13309 on Gentoo.
florent.xicluna
python-checkins at python.org
Tue Nov 1 17:06:47 CET 2011
http://hg.python.org/cpython/rev/5b1e1967ea9d
changeset: 73287:5b1e1967ea9d
user: Florent Xicluna <florent.xicluna at gmail.com>
date: Tue Nov 01 16:58:54 2011 +0100
summary:
Replace temporary tests with the real test case for issue #13309 on Gentoo.
files:
Lib/test/test_time.py | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -161,10 +161,6 @@
self.fail("conversion specifier %r failed with '%s' input." %
(format, strf_output))
- # XXX Temporary tests to troubleshoot issue #13309 on buildbots
- test_maa_strptime = test_strptime
- test_mzz_strptime = test_strptime
-
def test_strptime_bytes(self):
# Make sure only strings are accepted as arguments to strptime.
self.assertRaises(TypeError, time.strptime, b'2009', "%Y")
@@ -301,7 +297,8 @@
t1 = time.mktime(lt1)
self.assertAlmostEqual(t1, t0, delta=0.2)
- def test_mktime(self):
+ # XXX run last to work around issue #13309 on Gentoo
+ def test_ZZZ_mktime(self):
# Issue #1726687
for t in (-2, -1, 0, 1):
try:
@@ -310,8 +307,9 @@
pass
else:
self.assertEqual(time.mktime(tt), t)
- self.assertNotEqual(time.strftime('%Z', time.gmtime(self.t)), 'LMT',
- "strftime bug after processing t = %s" % t)
+ tt = time.gmtime(self.t)
+ tzname = time.strftime('%Z', tt)
+ self.assertNotEqual(tzname, 'LMT')
# It may not be possible to reliably make mktime return error
# on all platfom. This will make sure that no other exception
# than OverflowError is raised for an extreme value.
@@ -319,6 +317,10 @@
time.mktime((-1, 1, 1, 0, 0, 0, -1, -1, -1))
except OverflowError:
pass
+ msg = "Issue #13309: the '%Z' specifier reports wrong timezone"
+ self.assertEqual(time.strftime('%Z', tt), tzname, msg)
+ tt = time.gmtime(self.t)
+ self.assertEqual(time.strftime('%Z', tt), tzname, msg)
class TestLocale(unittest.TestCase):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list