From: Gregory P. Smith <greg@krypto.org>
Date: Sun, 1 Jun 2014 22:27:28 +0000 (-0700)
Subject: Skip test_subprocess test_close_fds_when_max_fd_is_lowered on FreeBSD
X-Git-Tag: v3.4.2rc1~466
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d04f699498bdb75804fa83a77c91809aa8c3298d;p=thirdparty%2FPython%2Fcpython.git

Skip test_subprocess test_close_fds_when_max_fd_is_lowered on FreeBSD
when fdescfs is not mounted on /dev/fd.
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index eb5f49cd8fd1..720025a1178a 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1927,6 +1927,9 @@ class POSIXProcessTestCase(BaseTestCase):
         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")