Kaydet (Commit) e7e941e7 authored tarafından Brett Cannon's avatar Brett Cannon

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.
üst ffd0dc1e
...@@ -156,7 +156,13 @@ class PlatformTest(unittest.TestCase): ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment