[Python-checkins] r78701 - python/trunk/Lib/test/test_subprocess.py

florent.xicluna python-checkins at python.org
Fri Mar 5 20:31:21 CET 2010


Author: florent.xicluna
Date: Fri Mar  5 20:31:21 2010
New Revision: 78701

Log:
#2777: Handle fds more carefully to try to fix some x86-Linux failures (namely, neal bot and twisted bot).


Modified:
   python/trunk/Lib/test/test_subprocess.py

Modified: python/trunk/Lib/test/test_subprocess.py
==============================================================================
--- python/trunk/Lib/test/test_subprocess.py	(original)
+++ python/trunk/Lib/test/test_subprocess.py	Fri Mar  5 20:31:21 2010
@@ -651,7 +651,10 @@
         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 @@
     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)
 


More information about the Python-checkins mailing list