summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-01-11 02:22:16 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-01-11 02:22:16 (GMT)
commita6892418ad1605bf5f7f669176c68b8738f9f776 (patch)
tree9c9791bda74b271389d144ad43184a8fdc5f1e88
parent31c5dd6b19e455fa2ab3dc1fc5497f152ce9bb7a (diff)
downloadcpython-a6892418ad1605bf5f7f669176c68b8738f9f776.zip
cpython-a6892418ad1605bf5f7f669176c68b8738f9f776.tar.gz
cpython-a6892418ad1605bf5f7f669176c68b8738f9f776.tar.bz2
This should fix mktime test on Windows
-rw-r--r--Lib/test/test_time.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 574a867..7266e27 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -347,7 +347,8 @@ class _Test4dYear(_BaseYearTest):
tt = time.localtime(t)
except (OverflowError, ValueError):
pass
- self.assertEqual(time.mktime(tt), t)
+ else:
+ self.assertEqual(time.mktime(tt), t)
# It may not be possible to reliably make mktime return error
# on all platfom. This will make sure that no other exception
# than OverflowError is raised for an extreme value.