From e36f37525ba57546511376d79ddb0f3e983b8f56 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 24 May 2011 00:29:43 +0200 Subject: Issue #12105: test_posix skips test_oscloexec() on Linux < 2.6.23 --- Lib/test/test_posix.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 07e6b08..9d9802b 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -310,10 +310,13 @@ class PosixTester(unittest.TestCase): @unittest.skipUnless(hasattr(os, 'O_CLOEXEC'), "needs os.O_CLOEXEC") 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, - 'CLOEXEC flag not set (O_CLOEXEC=0x%x)' % os.O_CLOEXEC) + self.assertTrue(fcntl.fcntl(fd, fcntl.F_GETFD) & fcntl.FD_CLOEXEC) def test_osexlock(self): if hasattr(posix, "O_EXLOCK"): -- cgit v0.12