From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 5 Dec 2015 10:18:25 +0000 (+0000)
Subject: Issue #25764: Remove test debugging
X-Git-Tag: v3.6.0a1~948
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d559cf72a5c80e7deda214022deb56ec8db1707;p=python

Issue #25764: Remove test debugging
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 81c2672c59..b32ef9788c 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1518,21 +1518,12 @@ class POSIXProcessTestCase(BaseTestCase):
         # The internal code did not preserve the previous exception when
         # re-enabling garbage collection
         try:
-            from resource import getrlimit, setrlimit, RLIMIT_NPROC, RLIM_INFINITY
+            from resource import getrlimit, setrlimit, RLIMIT_NPROC
         except ImportError as err:
             self.skipTest(err)  # RLIMIT_NPROC is specific to Linux and BSD
         limits = getrlimit(RLIMIT_NPROC)
         [_, hard] = limits
-        try:
-            setrlimit(RLIMIT_NPROC, limits)
-            setrlimit(RLIMIT_NPROC, (0, hard))
-        except ValueError as err:
-            # Seems to happen on various OS X buildbots
-            print(
-                f"Setting NPROC failed: {err!r}, limits={limits!r}, "
-                f"RLIM_INFINITY={RLIM_INFINITY!r}, "
-                f"getrlimit() -> {getrlimit(RLIMIT_NPROC)!r}")
-            self.skipTest("Setting NPROC limit failed")
+        setrlimit(RLIMIT_NPROC, (0, hard))
         self.addCleanup(setrlimit, RLIMIT_NPROC, limits)
         # Forking should raise EAGAIN, translated to BlockingIOError
         with self.assertRaises(BlockingIOError):