[Python-checkins] cpython (merge 3.4 -> default): Skip test_subprocess test_close_fds_when_max_fd_is_lowered on FreeBSD

gregory.p.smith python-checkins at python.org
Mon Jun 2 00:28:21 CEST 2014


http://hg.python.org/cpython/rev/9df126ee7005
changeset:   90955:9df126ee7005
parent:      90953:04f6487ad324
parent:      90954:84e86aa85eb4
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Jun 01 15:28:11 2014 -0700
summary:
  Skip test_subprocess test_close_fds_when_max_fd_is_lowered on FreeBSD
when fdescfs is not mounted on /dev/fd.

files:
  Lib/test/test_subprocess.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1927,6 +1927,9 @@
         self.assertIn(1, remaining_fds, "Subprocess failed")
 
 
+    @unittest.skipIf(sys.platform.startswith("freebsd") and
+                     os.stat("/dev").st_dev == os.stat("/dev/fd").st_dev,
+                     "Requires fdescfs mounted on /dev/fd on FreeBSD.")
     def test_close_fds_when_max_fd_is_lowered(self):
         """Confirm that issue21618 is fixed (may fail under valgrind)."""
         fd_status = support.findfile("fd_status.py", subdir="subprocessdata")

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


More information about the Python-checkins mailing list