[Python-checkins] cpython: Issue #18904: Improve os.get/set_inheritable() tests

Sun Sep 8 11:48:11 CEST 2013

http://hg.python.org/cpython/rev/b13cec63b495
changeset: 85618:b13cec63b495
user: Victor Stinner <victor.stinner at gmail.com>
date: Sun Sep 08 11:47:54 2013 +0200
summary:
 Issue #18904: Improve os.get/set_inheritable() tests
files:
 Lib/test/test_os.py | 36 ++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -34,6 +34,10 @@
 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 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)
-- 
Repository URL: http://hg.python.org/cpython
