[Python-checkins] r78724 - in python/branches/py3k: Lib/test/test_subprocess.py

florent.xicluna python-checkins at python.org
Sat Mar 6 12:52:51 CET 2010


Author: florent.xicluna
Date: Sat Mar  6 12:52:51 2010
New Revision: 78724

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_subprocess.py

Modified: python/branches/py3k/Lib/test/test_subprocess.py
==============================================================================
--- python/branches/py3k/Lib/test/test_subprocess.py	(original)
+++ python/branches/py3k/Lib/test/test_subprocess.py	Sat Mar  6 12:52:51 2010
@@ -767,21 +767,23 @@
         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()


More information about the Python-checkins mailing list