Merged revisions 78701 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78701 | florent.xicluna | 2010-03-05 20:31:21 +0100 (ven, 05 mar 2010) | 2 lines

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

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 09cfee86efa5b5278ad142e8ba4ae42ea2aef3b5..24c3bf9635515997c4be35451818d3ea314fc9ee 100644 (file)
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -649,7 +649,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)
@@ -670,14 +673,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)