[Python-checkins] cpython: Relax datetime.timestamp() test around DST change
alexander.belopolsky
python-checkins at python.org
Fri Jun 8 19:00:55 CEST 2012
http://hg.python.org/cpython/rev/239ebc022479
changeset: 77387:239ebc022479
user: Alexander Belopolsky <alexander.belopolsky at gmail.com>
date: Fri Jun 08 12:58:31 2012 -0400
summary:
Relax datetime.timestamp() test around DST change
files:
Lib/test/datetimetester.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1744,10 +1744,10 @@
t = self.theclass(1970, 1, 1, 1, 2, 3, 4)
self.assertEqual(t.timestamp(),
18000.0 + 3600 + 2*60 + 3 + 4*1e-6)
- # Missing hour defaults to standard time
+ # Missing hour may produce platform-dependent result
t = self.theclass(2012, 3, 11, 2, 30)
- self.assertEqual(self.theclass.fromtimestamp(t.timestamp()),
- t + timedelta(hours=1))
+ self.assertIn(self.theclass.fromtimestamp(t.timestamp()),
+ [t, t + timedelta(hours=1)])
# Ambiguous hour defaults to DST
t = self.theclass(2012, 11, 4, 1, 30)
self.assertEqual(self.theclass.fromtimestamp(t.timestamp()), t)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list