Issue #25764: Preserve subprocess fork exception when preexec_fn used

Also fix handling of failure to release the import lock.

1 files changed, 16 insertions, 0 deletions

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 2ce5951..188f337 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1416,6 +1416,22 @@ class POSIXProcessTestCase(BaseTestCase):
             if not enabled:
                 gc.disable()
 
+    def test_preexec_fork_failure(self):
+        # The internal code did not preserve the previous exception when
+        # re-enabling garbage collection
+        try:
+            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
+        setrlimit(RLIMIT_NPROC, (0, hard))
+        self.addCleanup(setrlimit, RLIMIT_NPROC, limits)
+        # Forking should raise EAGAIN, translated to BlockingIOError
+        with self.assertRaises(BlockingIOError):
+            subprocess.call([sys.executable, '-c', ''],
+                            preexec_fn=lambda: None)
+
     def test_args_string(self):
         # args is a string
         fd, fname = tempfile.mkstemp()