mirror of
https://github.com/python/cpython.git
synced 2025-08-01 07:33:08 +00:00
test_platform fails on OS X Snow Leopard because the UNIX command to get the
canonical version, sw_vers, leaves off trailing zeros in the version number (e.g. 10.6 instead of 10.6.0). Test now compensates by tacking on extra zeros for the test comparison. Fixes issue #6806.
This commit is contained in:
parent
ffd0dc1e8b
commit
e7e941e7f7
2 changed files with 10 additions and 1 deletions
|
@ -156,7 +156,13 @@ class PlatformTest(unittest.TestCase):
|
||||||
break
|
break
|
||||||
fd.close()
|
fd.close()
|
||||||
self.assertFalse(real_ver is None)
|
self.assertFalse(real_ver is None)
|
||||||
self.assertEquals(res[0], real_ver)
|
result_list = res[0].split('.')
|
||||||
|
expect_list = real_ver.split('.')
|
||||||
|
len_diff = len(result_list) - len(expect_list)
|
||||||
|
# On Snow Leopard, sw_vers reports 10.6.0 as 10.6
|
||||||
|
if len_diff > 0:
|
||||||
|
expect_list.extend(['0'] * len_diff)
|
||||||
|
self.assertEquals(result_list, expect_list)
|
||||||
|
|
||||||
# res[1] claims to contain
|
# res[1] claims to contain
|
||||||
# (version, dev_stage, non_release_version)
|
# (version, dev_stage, non_release_version)
|
||||||
|
|
|
@ -1328,6 +1328,9 @@ Extension Modules
|
||||||
Tests
|
Tests
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
- Issue #6806: test_platform failed under OS X 10.6.0 because ``sw_ver`` leaves
|
||||||
|
off the trailing 0 in the version number.
|
||||||
|
|
||||||
- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to
|
- Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to
|
||||||
Lib/lib-tk/test/test_tkinter/test_loadtk. With this, these tests demonstrate
|
Lib/lib-tk/test/test_tkinter/test_loadtk. With this, these tests demonstrate
|
||||||
the same behaviour as test_ttkguionly (and now also test_tk) which is to
|
the same behaviour as test_ttkguionly (and now also test_tk) which is to
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue