From: Florent Xicluna Date: Sat, 6 Mar 2010 00:19:38 +0000 (+0000) Subject: Merged revisions 78704 via svnmerge from X-Git-Tag: v3.2a1~1554 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0cc3df8d220dc23ab3a9cbf04bf1cbb0ae104375;p=thirdparty%2FPython%2Fcpython.git Merged revisions 78704 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78704 | florent.xicluna | 2010-03-06 01:16:57 +0100 (sam, 06 mar 2010) | 2 lines #2777: Apply same recipe for test_terminate and test_kill, i.e. close or redirect fds. ........ --- diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 24c3bf963551..b5ad6bacaf77 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -671,14 +671,16 @@ class POSIXProcessTestCase(unittest.TestCase): self.assertNotEqual(p.wait(), 0) def test_kill(self): - p = subprocess.Popen([sys.executable, "-c", "input()"]) + p = subprocess.Popen([sys.executable, "-c", "input()"], + stdin=subprocess.PIPE, close_fds=True) self.assertIsNone(p.poll()) p.kill() self.assertEqual(p.wait(), -signal.SIGKILL) def test_terminate(self): - p = subprocess.Popen([sys.executable, "-c", "input()"]) + p = subprocess.Popen([sys.executable, "-c", "input()"], + stdin=subprocess.PIPE, close_fds=True) self.assertIsNone(p.poll()) p.terminate()