Merged revisions 87921 via svnmerge from

abalkin · abalkin · commit 622ce124b677 · 2011-02-15T15:58:04.000Z
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
........
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
@@ -240,7 +240,8 @@ def test_mktime(self):
                 tt = time.localtime(t)
             except (OverflowError, ValueError):
                 pass
-            self.assertEqual(time.mktime(tt), t)
+            else:
+                self.assertEqual(time.mktime(tt), t)
 
 class TestLocale(unittest.TestCase):
     def setUp(self):
