From 5ca31edd0efe9869b5af877818b57d6cd395cd8e Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Mon, 31 May 2010 16:21:02 +0000 Subject: [PATCH] Merged revisions 81560 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81560 | alexander.belopolsky | 2010-05-26 16:48:30 -0400 (Wed, 26 May 2010) | 10 lines Merged revisions 81559 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81559 | alexander.belopolsky | 2010-05-26 16:45:37 -0400 (Wed, 26 May 2010) | 3 lines Issue #7879: Skip negative timestamps test on any Windows platform using unittest.skipIf decorator. ........ ................ --- Lib/test/test_datetime.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index a971c685fc4..d5238e70b72 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -1493,19 +1493,14 @@ class TestDateTime(TestDate): for insane in -1e200, 1e200: self.assertRaises(ValueError, self.theclass.utcfromtimestamp, insane) - + @unittest.skipIf(sys.platform == "win32", "Windows doesn't accept negative timestamps") def test_negative_float_fromtimestamp(self): - # Windows doesn't accept negative timestamps - if sys.platform == "win32": - return # The result is tz-dependent; at least test that this doesn't # fail (like it did before bug 1646728 was fixed). self.theclass.fromtimestamp(-1.05) + @unittest.skipIf(sys.platform == "win32", "Windows doesn't accept negative timestamps") def test_negative_float_utcfromtimestamp(self): - # Windows doesn't accept negative timestamps - if sys.platform == "win32": - return d = self.theclass.utcfromtimestamp(-1.05) self.assertEquals(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000))