mirror of https://github.com/python/cpython
merge 3.2
This commit is contained in:
commit
c07f3be4e0
|
@ -1491,6 +1491,64 @@ class POSIXProcessTestCase(BaseTestCase):
|
||||||
finally:
|
finally:
|
||||||
p.wait()
|
p.wait()
|
||||||
|
|
||||||
|
def test_zombie_fast_process_del(self):
|
||||||
|
# Issue #12650: on Unix, if Popen.__del__() was called before the
|
||||||
|
# process exited, it wouldn't be added to subprocess._active, and would
|
||||||
|
# remain a zombie.
|
||||||
|
# spawn a Popen, and delete its reference before it exits
|
||||||
|
p = subprocess.Popen([sys.executable, "-c",
|
||||||
|
'import sys, time;'
|
||||||
|
'time.sleep(0.2)'],
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE)
|
||||||
|
ident = id(p)
|
||||||
|
pid = p.pid
|
||||||
|
del p
|
||||||
|
# check that p is in the active processes list
|
||||||
|
self.assertIn(ident, [id(o) for o in subprocess._active])
|
||||||
|
|
||||||
|
# sleep a little to let the process exit, and create a new Popen: this
|
||||||
|
# should trigger the wait() of p
|
||||||
|
time.sleep(1)
|
||||||
|
with self.assertRaises(EnvironmentError) as c:
|
||||||
|
with subprocess.Popen(['nonexisting_i_hope'],
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE) as proc:
|
||||||
|
pass
|
||||||
|
# p should have been wait()ed on, and removed from the _active list
|
||||||
|
self.assertRaises(OSError, os.waitpid, pid, 0)
|
||||||
|
self.assertNotIn(ident, [id(o) for o in subprocess._active])
|
||||||
|
|
||||||
|
def test_leak_fast_process_del_killed(self):
|
||||||
|
# Issue #12650: on Unix, if Popen.__del__() was called before the
|
||||||
|
# process exited, and the process got killed by a signal, it would never
|
||||||
|
# be removed from subprocess._active, which triggered a FD and memory
|
||||||
|
# leak.
|
||||||
|
# spawn a Popen, delete its reference and kill it
|
||||||
|
p = subprocess.Popen([sys.executable, "-c",
|
||||||
|
'import time;'
|
||||||
|
'time.sleep(3)'],
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE)
|
||||||
|
ident = id(p)
|
||||||
|
pid = p.pid
|
||||||
|
del p
|
||||||
|
os.kill(pid, signal.SIGKILL)
|
||||||
|
# check that p is in the active processes list
|
||||||
|
self.assertIn(ident, [id(o) for o in subprocess._active])
|
||||||
|
|
||||||
|
# let some time for the process to exit, and create a new Popen: this
|
||||||
|
# should trigger the wait() of p
|
||||||
|
time.sleep(0.2)
|
||||||
|
with self.assertRaises(EnvironmentError) as c:
|
||||||
|
with subprocess.Popen(['nonexisting_i_hope'],
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE) as proc:
|
||||||
|
pass
|
||||||
|
# p should have been wait()ed on, and removed from the _active list
|
||||||
|
self.assertRaises(OSError, os.waitpid, pid, 0)
|
||||||
|
self.assertNotIn(ident, [id(o) for o in subprocess._active])
|
||||||
|
|
||||||
|
|
||||||
@unittest.skipUnless(mswindows, "Windows specific tests")
|
@unittest.skipUnless(mswindows, "Windows specific tests")
|
||||||
class Win32ProcessTestCase(BaseTestCase):
|
class Win32ProcessTestCase(BaseTestCase):
|
||||||
|
|
Loading…
Reference in New Issue