diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-31 16:00:34 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-31 16:00:34 (GMT) |
| commit | f5144ff58651e07c696cc9d8ed51650484505169 (patch) | |
| tree | 4857aa8e746c15b014355bb02c5948b2c941c03f | |
| parent | 1fe418839630dbedfdcbcd038dcc2b954a508fe7 (diff) | |
| download | cpython-f5144ff58651e07c696cc9d8ed51650484505169.zip cpython-f5144ff58651e07c696cc9d8ed51650484505169.tar.gz cpython-f5144ff58651e07c696cc9d8ed51650484505169.tar.bz2 | |
Merged revisions 81555 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81555 | alexander.belopolsky | 2010-05-26 15:43:16 -0400 (Wed, 26 May 2010) | 3 lines
Issue #7879: Do not test negative timestamps on any Windows platform
including Windows CE.
........
| -rw-r--r-- | Lib/test/test_datetime.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index 056b74f..735582f 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -3,7 +3,7 @@ See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases """ -import os +import sys import pickle import cPickle import unittest @@ -1503,7 +1503,7 @@ class TestDateTime(TestDate): def test_negative_float_fromtimestamp(self): # Windows doesn't accept negative timestamps - if os.name == "nt": + 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). @@ -1511,7 +1511,7 @@ class TestDateTime(TestDate): def test_negative_float_utcfromtimestamp(self): # Windows doesn't accept negative timestamps - if os.name == "nt": + if sys.platform == "win32": return d = self.theclass.utcfromtimestamp(-1.05) self.assertEquals(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000)) |