[Python-checkins] cpython: Issue #12196: Make test.support's requires_linux_version a decorator.

Fri Jun 3 13:00:07 CEST 2011

http://hg.python.org/cpython/rev/277bbe6cae53
changeset: 70612:277bbe6cae53
parent: 70610:94cfd8a5df11
user: Charles-François Natali <neologix at free.fr>
date: Fri Jun 03 12:55:15 2011 +0200
summary:
 Issue #12196: Make test.support's requires_linux_version a decorator.
files:
 Lib/test/support.py | 37 +++++++++++++++++++++-------
 Lib/test/test_posix.py | 10 +------
 Lib/test/test_socket.py | 15 ++---------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -37,8 +37,8 @@
 "Error", "TestFailed", "ResourceDenied", "import_module",
 "verbose", "use_resources", "max_memuse", "record_original_stdout",
 "get_original_stdout", "unload", "unlink", "rmtree", "forget",
- "is_resource_enabled", "requires", "linux_version", "requires_mac_ver",
- "find_unused_port", "bind_port",
+ "is_resource_enabled", "requires", "requires_linux_version",
+ "requires_mac_ver", "find_unused_port", "bind_port",
 "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd",
 "findfile", "sortdict", "check_syntax_error", "open_urlresource",
 "check_warnings", "CleanImport", "EnvironmentVarGuard", "TransientResource",
@@ -292,13 +292,32 @@
 msg = "Use of the `%s' resource not enabled" % resource
 raise ResourceDenied(msg)
 
-def linux_version():
- try:
- # platform.release() is something like '2.6.33.7-desktop-2mnb'
- version_string = platform.release().split('-')[0]
- return tuple(map(int, version_string.split('.')))
- except ValueError:
- return 0, 0, 0
+def requires_linux_version(*min_version):
+ """Decorator raising SkipTest if the OS is Linux and the kernel version is
+ less than min_version.
+
+ For example, @requires_linux_version(2, 6, 35) raises SkipTest if the Linux
+ kernel version is less than 2.6.35.
+ """
+ def decorator(func):
+ @functools.wraps(func)
+ def wrapper(*args, **kw):
+ if sys.platform.startswith('linux'):
+ version_txt = platform.release().split('-', 1)[0]
+ try:
+ version = tuple(map(int, version_txt.split('.')))
+ except ValueError:
+ pass
+ else:
+ if version < min_version:
+ min_version_txt = '.'.join(map(str, min_version))
+ raise unittest.SkipTest(
+ "Linux kernel %s or higher required, not %s"
+ % (min_version_txt, version_txt))
+ return func(*args, **kw)
+ wrapper.min_version = min_version
+ return wrapper
+ return decorator
 
 def requires_mac_ver(*min_version):
 """Decorator raising SkipTest if the OS is Mac OS X and the OS X
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -309,11 +309,8 @@
 fp2.close()
 
 @unittest.skipUnless(hasattr(os, 'O_CLOEXEC'), "needs os.O_CLOEXEC")
+ @support.requires_linux_version(2, 6, 23)
 def test_oscloexec(self):
- version = support.linux_version()
- if sys.platform == 'linux2' and version < (2, 6, 23):
- self.skipTest("Linux kernel 2.6.23 or higher required, "
- "not %s.%s.%s" % version)
 fd = os.open(support.TESTFN, os.O_RDONLY|os.O_CLOEXEC)
 self.addCleanup(os.close, fd)
 self.assertTrue(fcntl.fcntl(fd, fcntl.F_GETFD) & fcntl.FD_CLOEXEC)
@@ -479,11 +476,8 @@
 os.close(writer)
 
 @unittest.skipUnless(hasattr(os, 'pipe2'), "test needs os.pipe2()")
+ @support.requires_linux_version(2, 6, 27)
 def test_pipe2(self):
- version = support.linux_version()
- if sys.platform == 'linux2' and version < (2, 6, 27):
- self.skipTest("Linux kernel 2.6.27 or higher required, "
- "not %s.%s.%s" % version)
 self.assertRaises(TypeError, os.pipe2, 'DEADBEEF')
 self.assertRaises(TypeError, os.pipe2, 0, 0)
 
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1023,11 +1023,8 @@
 pass
 
 if hasattr(socket, "SOCK_NONBLOCK"):
+ @support.requires_linux_version(2, 6, 28)
 def testInitNonBlocking(self):
- v = support.linux_version()
- if v < (2, 6, 28):
- self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
- % ".".join(map(str, v)))
 # reinit server socket
 self.serv.close()
 self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM |
@@ -2001,11 +1998,8 @@
 "SOCK_CLOEXEC not defined")
 @unittest.skipUnless(fcntl, "module fcntl not available")
 class CloexecConstantTest(unittest.TestCase):
+ @support.requires_linux_version(2, 6, 28)
 def test_SOCK_CLOEXEC(self):
- v = support.linux_version()
- if v < (2, 6, 28):
- self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
- % ".".join(map(str, v)))
 with socket.socket(socket.AF_INET,
 socket.SOCK_STREAM | socket.SOCK_CLOEXEC) as s:
 self.assertTrue(s.type & socket.SOCK_CLOEXEC)
@@ -2023,11 +2017,8 @@
 self.assertFalse(s.type & socket.SOCK_NONBLOCK)
 self.assertEqual(s.gettimeout(), None)
 
+ @support.requires_linux_version(2, 6, 28)
 def test_SOCK_NONBLOCK(self):
- v = support.linux_version()
- if v < (2, 6, 28):
- self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
- % ".".join(map(str, v)))
 # a lot of it seems silly and redundant, but I wanted to test that
 # changing back and forth worked ok
 with socket.socket(socket.AF_INET,
-- 
Repository URL: http://hg.python.org/cpython
