traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
........
This commit is contained in:
Florent Xicluna 2010-03-05 20:26:54 +00:00
parent f9cee22446
commit 1d8ee3afb8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_subprocess.py
View File

@ -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)