From f9ad7d476ab288ef9fef5c1812ac5acf544e36a3 Mon Sep 17 00:00:00 2001
From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Tue, 15 Feb 2011 16:01:11 +0000
Subject: [PATCH] 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
........
---
 Lib/test/test_time.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index d70b59f1d0e..b4d12b4aaf9 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -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():