]> granicus.if.org Git - python/commitdiff
Merged revisions 87921 via svnmerge from
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 15 Feb 2011 16:01:11 +0000 (16:01 +0000)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 15 Feb 2011 16:01:11 +0000 (16:01 +0000)
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
........

Lib/test/test_time.py

index d70b59f1d0ee791f1d6bc40eab5c9d23366a78be..b4d12b4aaf9bc7a1db6e66029f53aa644427e1e6 100644 (file)
@@ -230,7 +230,8 @@ class TimeTestCase(unittest.TestCase):
                 tt = time.localtime(t)
             except (OverflowError, ValueError):
                 pass
-            self.assertEqual(time.mktime(tt), t)
+            else:
+                self.assertEqual(time.mktime(tt), t)
 
 
 def test_main():