diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-26 20:00:12 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-26 20:00:12 (GMT) |
| commit | d5442cd37a391052723113e10f61a51da48f749e (patch) | |
| tree | 114a363f04a5a832e1cedb6a116789f0aada01cb /Lib | |
| parent | 56544db46d4efceed4970a8bdf69f0e425738ed6 (diff) | |
| download | cpython-d5442cd37a391052723113e10f61a51da48f749e.zip cpython-d5442cd37a391052723113e10f61a51da48f749e.tar.gz cpython-d5442cd37a391052723113e10f61a51da48f749e.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.
........
Diffstat (limited to 'Lib')
| -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 f65fbca..0159be0 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 unittest @@ -1557,7 +1557,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). @@ -1565,7 +1565,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)) |