mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line complain when there's no last exception ........ r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line fix newline issue in test summary ........ r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line another style nit ........ r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line add shorthands for expected failures and unexpected success ........ r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line remove uneeded function ........ r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line add much better tests for python version information parsing ........ r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line more and more implementations now support sys.subversion ........ r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line roll old test in with new one ........ r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line add support for PyPy ........ r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines add some useful utilities for skipping tests with unittest's new skipping ability most significantly apply a modified portion of the patch from #4242 with patches for skipping implementation details ........ r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571 ........ r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line apply the second part of #4242's patch; classify all the implementation details in test_descr ........ r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line remove test_support.TestSkipped and just use unittest.SkipTest ........ r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line fix naming ........ r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line fix incorrect auto-translation of TestSkipped -> unittest.SkipTest ........ r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line must pass argument to get expected behavior ;) ........ r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line add missing import ........ r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line ** is required here ........ r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line update email tests to use SkipTest ........ r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line fix another name ........
This commit is contained in:
Benjamin Peterson
parent
b556452055
commit
e549ead826
43 changed files with 359 additions and 215 deletions
|
|
@ -48,25 +48,73 @@ class PlatformTest(unittest.TestCase):
|
|||
def test_processor(self):
|
||||
res = platform.processor()
|
||||
|
||||
def test_python_implementation(self):
|
||||
res = platform.python_implementation()
|
||||
def setUp(self):
|
||||
self.save_version = sys.version
|
||||
self.save_subversion = sys.subversion
|
||||
self.save_platform = sys.platform
|
||||
|
||||
def test_python_version(self):
|
||||
res1 = platform.python_version()
|
||||
res2 = platform.python_version_tuple()
|
||||
self.assertEqual(res1, ".".join(res2))
|
||||
def tearDown(self):
|
||||
sys.version = self.save_version
|
||||
sys.subversion = self.save_subversion
|
||||
sys.platform = self.save_platform
|
||||
|
||||
def test_python_branch(self):
|
||||
res = platform.python_branch()
|
||||
def test_sys_version(self):
|
||||
# Old test.
|
||||
for input, output in (
|
||||
('2.4.3 (#1, Jun 21 2006, 13:54:21) \n[GCC 3.3.4 (pre 3.3.5 20040809)]',
|
||||
('CPython', '2.4.3', '', '', '1', 'Jun 21 2006 13:54:21', 'GCC 3.3.4 (pre 3.3.5 20040809)')),
|
||||
('IronPython 1.0.60816 on .NET 2.0.50727.42',
|
||||
('IronPython', '1.0.60816', '', '', '', '', '.NET 2.0.50727.42')),
|
||||
('IronPython 1.0 (1.0.61005.1977) on .NET 2.0.50727.42',
|
||||
('IronPython', '1.0.0', '', '', '', '', '.NET 2.0.50727.42')),
|
||||
):
|
||||
# branch and revision are not "parsed", but fetched
|
||||
# from sys.subversion. Ignore them
|
||||
(name, version, branch, revision, buildno, builddate, compiler) \
|
||||
= platform._sys_version(input)
|
||||
self.assertEqual(
|
||||
(name, version, '', '', buildno, builddate, compiler), output)
|
||||
|
||||
def test_python_revision(self):
|
||||
res = platform.python_revision()
|
||||
|
||||
def test_python_build(self):
|
||||
res = platform.python_build()
|
||||
|
||||
def test_python_compiler(self):
|
||||
res = platform.python_compiler()
|
||||
# Tests for python_implementation(), python_version(), python_branch(),
|
||||
# python_revision(), python_build(), and python_compiler().
|
||||
sys_versions = {
|
||||
("2.6.1 (r261:67515, Dec 6 2008, 15:26:00) \n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]",
|
||||
('CPython', 'tags/r261', '67515'), self.save_platform)
|
||||
:
|
||||
("CPython", "2.6.1", "tags/r261", "67515",
|
||||
('r261:67515', 'Dec 6 2008 15:26:00'),
|
||||
'GCC 4.0.1 (Apple Computer, Inc. build 5370)'),
|
||||
("IronPython 2.0 (2.0.0.0) on .NET 2.0.50727.3053", None, "cli")
|
||||
:
|
||||
("IronPython", "2.0.0", "", "", ("", ""),
|
||||
".NET 2.0.50727.3053"),
|
||||
("2.5 (trunk:6107, Mar 26 2009, 13:02:18) \n[Java HotSpot(TM) Client VM (\"Apple Computer, Inc.\")]",
|
||||
('Jython', 'trunk', '6107'), "java1.5.0_16")
|
||||
:
|
||||
("Jython", "2.5.0", "trunk", "6107",
|
||||
('trunk:6107', 'Mar 26 2009'), "java1.5.0_16"),
|
||||
("2.5.2 (63378, Mar 26 2009, 18:03:29)\n[PyPy 1.0.0]",
|
||||
('PyPy', 'trunk', '63378'), self.save_platform)
|
||||
:
|
||||
("PyPy", "2.5.2", "trunk", "63378", ('63378', 'Mar 26 2009'),
|
||||
"")
|
||||
}
|
||||
for (version_tag, subversion, sys_platform), info in \
|
||||
sys_versions.items():
|
||||
sys.version = version_tag
|
||||
if subversion is None:
|
||||
if hasattr(sys, "subversion"):
|
||||
del sys.subversion
|
||||
else:
|
||||
sys.subversion = subversion
|
||||
if sys_platform is not None:
|
||||
sys.platform = sys_platform
|
||||
self.assertEqual(platform.python_implementation(), info[0])
|
||||
self.assertEqual(platform.python_version(), info[1])
|
||||
self.assertEqual(platform.python_branch(), info[2])
|
||||
self.assertEqual(platform.python_revision(), info[3])
|
||||
self.assertEqual(platform.python_build(), info[4])
|
||||
self.assertEqual(platform.python_compiler(), info[5])
|
||||
|
||||
def test_system_alias(self):
|
||||
res = platform.system_alias(
|
||||
|
|
@ -140,23 +188,6 @@ class PlatformTest(unittest.TestCase):
|
|||
):
|
||||
self.assertEqual(platform._parse_release_file(input), output)
|
||||
|
||||
def test_sys_version(self):
|
||||
|
||||
platform._sys_version_cache.clear()
|
||||
for input, output in (
|
||||
('2.4.3 (#1, Jun 21 2006, 13:54:21) \n[GCC 3.3.4 (pre 3.3.5 20040809)]',
|
||||
('CPython', '2.4.3', '', '', '1', 'Jun 21 2006 13:54:21', 'GCC 3.3.4 (pre 3.3.5 20040809)')),
|
||||
('IronPython 1.0.60816 on .NET 2.0.50727.42',
|
||||
('IronPython', '1.0.60816', '', '', '', '', '.NET 2.0.50727.42')),
|
||||
('IronPython 1.0 (1.0.61005.1977) on .NET 2.0.50727.42',
|
||||
('IronPython', '1.0.0', '', '', '', '', '.NET 2.0.50727.42')),
|
||||
):
|
||||
# branch and revision are not "parsed", but fetched
|
||||
# from sys.subversion. Ignore them
|
||||
(name, version, branch, revision, buildno, builddate, compiler) \
|
||||
= platform._sys_version(input)
|
||||
self.assertEqual(
|
||||
(name, version, '', '', buildno, builddate, compiler), output)
|
||||
|
||||
def test_main():
|
||||
support.run_unittest(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue