Commit d5442cd3 authored by Alexander Belopolsky's avatar Alexander Belopolsky

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.
........
parent 56544db4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
""" """
import os import sys
import pickle import pickle
import unittest import unittest
...@@ -1557,7 +1557,7 @@ class TestDateTime(TestDate): ...@@ -1557,7 +1557,7 @@ class TestDateTime(TestDate):
def test_negative_float_fromtimestamp(self): def test_negative_float_fromtimestamp(self):
# Windows doesn't accept negative timestamps # Windows doesn't accept negative timestamps
if os.name == "nt": if sys.platform == "win32":
return return
# The result is tz-dependent; at least test that this doesn't # The result is tz-dependent; at least test that this doesn't
# fail (like it did before bug 1646728 was fixed). # fail (like it did before bug 1646728 was fixed).
...@@ -1565,7 +1565,7 @@ class TestDateTime(TestDate): ...@@ -1565,7 +1565,7 @@ class TestDateTime(TestDate):
def test_negative_float_utcfromtimestamp(self): def test_negative_float_utcfromtimestamp(self):
# Windows doesn't accept negative timestamps # Windows doesn't accept negative timestamps
if os.name == "nt": if sys.platform == "win32":
return return
d = self.theclass.utcfromtimestamp(-1.05) d = self.theclass.utcfromtimestamp(-1.05)
self.assertEquals(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000)) self.assertEquals(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment