diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:58:04 +0000 |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:58:04 +0000 |
| commit | e6ca45a6d7fa6c5575eec9d707694cdeea391b14 (patch) | |
| tree | 26446129d8dd57358dbafca297beb22852e3ccbe | |
| parent | 7270adcf821187ce9298ad2d59b1cf237ca94f8f (diff) | |
| download | cpython-e6ca45a6d7fa6c5575eec9d707694cdeea391b14.tar.gz | |
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
........
| -rw-r--r-- | Lib/test/test_time.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index d4f7d8002f..b68cd6a744 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -240,7 +240,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) class TestLocale(unittest.TestCase): def setUp(self): |