From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 23 May 2011 22:29:43 +0000 (+0200)
Subject: Issue #12105: test_posix skips test_oscloexec() on Linux < 2.6.23
X-Git-Tag: v3.3.0a1~2183^2~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e36f37525ba57546511376d79ddb0f3e983b8f56;p=python

Issue #12105: test_posix skips test_oscloexec() on Linux < 2.6.23
---

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 07e6b082e6..9d9802bb7e 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"):