From 0c687e5e88f044f5f65d4476970d7ec12dc67dbb Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Fri, 8 Jun 2012 12:58:31 -0400 Subject: Relax datetime.timestamp() test around DST change --- Lib/test/datetimetester.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 9d84b9d..266ef69 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -1744,10 +1744,10 @@ class TestDateTime(TestDate): 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) -- cgit v0.12