From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sat, 6 Mar 2010 11:52:51 +0000 (+0000)
Subject: Merged revisions 78721 via svnmerge from
X-Git-Tag: v3.2a1~1549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fadf93a162858d0945363d820533594de5b48aec;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78721 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78721 | florent.xicluna | 2010-03-06 10:54:14 +0100 (sam, 06 mar 2010) | 2 lines

  #2777: Apply same recipe on win32, i.e. do not inherit file handles.
........
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index b5ad6bacaf77..a5e831db0d33 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -767,21 +767,23 @@ class Win32ProcessTestCase(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 failure on some platforms.
+        p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True)
 
         self.assertIs(p.poll(), None)
         p.send_signal(signal.SIGTERM)
         self.assertNotEqual(p.wait(), 0)
 
     def test_kill(self):
-        p = subprocess.Popen([sys.executable, "-c", "input()"])
+        p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True)
 
         self.assertIs(p.poll(), None)
         p.kill()
         self.assertNotEqual(p.wait(), 0)
 
     def test_terminate(self):
-        p = subprocess.Popen([sys.executable, "-c", "input()"])
+        p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True)
 
         self.assertIs(p.poll(), None)
         p.terminate()