summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-06-03 10:55:15 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-06-03 10:55:15 (GMT)
commit239bb965402119beb5041367bc1950555b11aff9 (patch)
treef3da6c709f439f4798e64d4579458b66da0f3463
parent22cc1183a3d92a29836de3c79f5e7b099e39c1f1 (diff)
downloadcpython-239bb965402119beb5041367bc1950555b11aff9.zip
cpython-239bb965402119beb5041367bc1950555b11aff9.tar.gz
cpython-239bb965402119beb5041367bc1950555b11aff9.tar.bz2
Issue #12196: Make test.support's requires_linux_version a decorator.
-rw-r--r--Lib/test/support.py37
-rw-r--r--Lib/test/test_posix.py10
-rw-r--r--Lib/test/test_socket.py15
3 files changed, 33 insertions, 29 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index d3f7f4c..ec2378b 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -37,8 +37,8 @@ __all__ = [
"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 @@ def requires(resource, msg=None):
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
index 79e2d36..421ea68 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -309,11 +309,8 @@ class PosixTester(unittest.TestCase):
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 @@ class PosixTester(unittest.TestCase):
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
index 59e3019..a00a99f 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1023,11 +1023,8 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
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 @@ class ContextManagersTest(ThreadedTCPSocketTest):
"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 @@ class NonblockConstantTest(unittest.TestCase):
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,