From cecef392f103efceeedcdf48d4eccb01e859df43 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Fri, 5 Mar 2010 19:31:21 +0000 Subject: [PATCH] #2777: Handle fds more carefully to try to fix some x86-Linux failures (namely, neal bot and twisted bot). --- Lib/test/test_subprocess.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 84ea9ed8bf..7437e6c3fb 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -651,7 +651,10 @@ class POSIXProcessTestCase(unittest.TestCase): self.assertEqual(rc, 47) def test_send_signal(self): - p = subprocess.Popen([sys.executable, "-c", "input()"]) + # Do not inherit file handles from the parent. + # It should fix failures on some platforms. + p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True, + stdin=subprocess.PIPE, stderr=subprocess.PIPE) # Let the process initialize correctly (Issue #3137) time.sleep(0.1) @@ -672,14 +675,14 @@ class POSIXProcessTestCase(unittest.TestCase): def test_kill(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) - self.assertIs(p.poll(), None) + self.assertIsNone(p.poll()) p.kill() self.assertEqual(p.wait(), -signal.SIGKILL) def test_terminate(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) - self.assertIs(p.poll(), None) + self.assertIsNone(p.poll()) p.terminate() self.assertEqual(p.wait(), -signal.SIGTERM) -- 2.50.1