[Python-checkins] cpython: test_posix.test_pipe2() now checks that the O_NONBLOCK flag is set

victor.stinner python-checkins at python.org
Wed Aug 28 12:44:47 CEST 2013


http://hg.python.org/cpython/rev/7cd88597d7e3
changeset:   85431:7cd88597d7e3
user:        Victor Stinner <vstinner at wyplay.com>
date:        Wed Aug 28 12:25:40 2013 +0200
summary:
  test_posix.test_pipe2() now checks that the O_NONBLOCK flag is set

Use also os.get_inheritable() instead of fcntl() to check the inheritable flag
(FD_CLOEXEC).

files:
  Lib/test/test_posix.py |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -563,8 +563,10 @@
         r, w = os.pipe2(os.O_CLOEXEC|os.O_NONBLOCK)
         self.addCleanup(os.close, r)
         self.addCleanup(os.close, w)
-        self.assertTrue(fcntl.fcntl(r, fcntl.F_GETFD) & fcntl.FD_CLOEXEC)
-        self.assertTrue(fcntl.fcntl(w, fcntl.F_GETFD) & fcntl.FD_CLOEXEC)
+        self.assertFalse(os.get_inheritable(r))
+        self.assertFalse(os.get_inheritable(w))
+        self.assertTrue(fcntl.fcntl(r, fcntl.F_GETFL) & os.O_NONBLOCK)
+        self.assertTrue(fcntl.fcntl(w, fcntl.F_GETFL) & os.O_NONBLOCK)
         # try reading from an empty pipe: this should fail, not block
         self.assertRaises(OSError, os.read, r, 1)
         # try a write big enough to fill-up the pipe: this should either

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list