[Python-checkins] r81560 - in python/branches/py3k: Lib/test/test_datetime.py
alexander.belopolsky
python-checkins at python.org
Wed May 26 22:48:30 CEST 2010
Author: alexander.belopolsky
Date: Wed May 26 22:48:30 2010
New Revision: 81560
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_datetime.py
Modified: python/branches/py3k/Lib/test/test_datetime.py
==============================================================================
--- python/branches/py3k/Lib/test/test_datetime.py (original)
+++ python/branches/py3k/Lib/test/test_datetime.py Wed May 26 22:48:30 2010
@@ -1554,19 +1554,14 @@
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))
More information about the Python-checkins
mailing list