From: Victor Stinner <victor.stinner@gmail.com>
Date: Sun, 8 Sep 2013 09:47:54 +0000 (+0200)
Subject: Issue #18904: Improve os.get/set_inheritable() tests
X-Git-Tag: v3.4.0a3~27^2~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ba6b0f943ed9fc1782ec5813a07440d98d64554;p=thirdparty%2FPython%2Fcpython.git

Issue #18904: Improve os.get/set_inheritable() tests
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index d0dd364f89a0..aa48045a3036 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -34,6 +34,10 @@ try:
     import resource
 except ImportError:
     resource = None
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
 
 from test.script_helper import assert_python_ok
 
@@ -2300,19 +2304,37 @@ class CPUCountTests(unittest.TestCase):
 
 
 class FDInheritanceTests(unittest.TestCase):
-    def test_get_inheritable(self):
+    def test_get_set_inheritable(self):
         fd = os.open(__file__, os.O_RDONLY)
         self.addCleanup(os.close, fd)
-        for inheritable in (False, True):
-            os.set_inheritable(fd, inheritable)
-            self.assertEqual(os.get_inheritable(fd), inheritable)
+        self.assertEqual(os.get_inheritable(fd), False)
 
-    def test_set_inheritable(self):
-        fd = os.open(__file__, os.O_RDONLY)
-        self.addCleanup(os.close, fd)
         os.set_inheritable(fd, True)
         self.assertEqual(os.get_inheritable(fd), True)
 
+    if fcntl:
+        def test_get_inheritable_cloexec(self):
+            fd = os.open(__file__, os.O_RDONLY)
+            self.addCleanup(os.close, fd)
+            self.assertEqual(os.get_inheritable(fd), False)
+
+            # clear FD_CLOEXEC flag
+            flags = fcntl.fcntl(fd, fcntl.F_GETFD)
+            flags &= ~fcntl.FD_CLOEXEC
+            fcntl.fcntl(fd, fcntl.F_SETFD, flags)
+
+            self.assertEqual(os.get_inheritable(fd), True)
+
+        def test_set_inheritable_cloexec(self):
+            fd = os.open(__file__, os.O_RDONLY)
+            self.addCleanup(os.close, fd)
+            self.assertEqual(fcntl.fcntl(fd, fcntl.F_GETFD) & fcntl.FD_CLOEXEC,
+                             fcntl.FD_CLOEXEC)
+
+            os.set_inheritable(fd, True)
+            self.assertEqual(fcntl.fcntl(fd, fcntl.F_GETFD) & fcntl.FD_CLOEXEC,
+                             0)
+
     def test_open(self):
         fd = os.open(__file__, os.O_RDONLY)
         self.addCleanup(os.close, fd)