[Python-checkins] r88429 - in python/branches/release27-maint: Lib/test/test_time.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Tue Feb 15 17:01:11 2011
New Revision: 88429

Log:
Merged revisions 87921 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87921 | alexander.belopolsky | 2011-01-10 21:22:16 -0500 (Mon, 10 Jan 2011) | 1 line
  
  This should fix mktime test on Windows
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_time.py

Modified: python/branches/release27-maint/Lib/test/test_time.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_time.py	(original)
+++ python/branches/release27-maint/Lib/test/test_time.py	Tue Feb 15 17:01:11 2011
@@ -230,7 +230,8 @@
                 tt = time.localtime(t)
             except (OverflowError, ValueError):
                 pass
-            self.assertEqual(time.mktime(tt), t)
+            else:
+                self.assertEqual(time.mktime(tt), t)
 
 
 def test_main():