Commit 667d4b57 authored by Victor Stinner's avatar Victor Stinner

Issue #10763: subprocess.communicate() closes stdout and stderr if both are

pipes (bug specific to Windows).

Improve also the unit test: write a portable unit test.
parent 291151b7
...@@ -985,6 +985,7 @@ class Popen(object): ...@@ -985,6 +985,7 @@ class Popen(object):
def _readerthread(self, fh, buffer): def _readerthread(self, fh, buffer):
buffer.append(fh.read()) buffer.append(fh.read())
fh.close()
def _communicate(self, input): def _communicate(self, input):
......
...@@ -366,22 +366,28 @@ class ProcessTestCase(BaseTestCase): ...@@ -366,22 +366,28 @@ class ProcessTestCase(BaseTestCase):
self.assertEqual(stdout, b"banana") self.assertEqual(stdout, b"banana")
self.assertStderrEqual(stderr, b"pineapple") self.assertStderrEqual(stderr, b"pineapple")
# This test is Linux specific for simplicity to at least have
# some coverage. It is not a platform specific bug.
@unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
"Linux specific")
# Test for the fd leak reported in http://bugs.python.org/issue2791. # Test for the fd leak reported in http://bugs.python.org/issue2791.
def test_communicate_pipe_fd_leak(self): def test_communicate_pipe_fd_leak(self):
fd_directory = '/proc/%d/fd' % os.getpid() for stdin_pipe in (False, True):
num_fds_before_popen = len(os.listdir(fd_directory)) for stdout_pipe in (False, True):
p = subprocess.Popen([sys.executable, "-c", "print()"], for stderr_pipe in (False, True):
stdout=subprocess.PIPE) options = {}
if stdin_pipe:
options['stdin'] = subprocess.PIPE
if stdout_pipe:
options['stdout'] = subprocess.PIPE
if stderr_pipe:
options['stderr'] = subprocess.PIPE
if not options:
continue
p = subprocess.Popen((sys.executable, "-c", "pass"), **options)
p.communicate() p.communicate()
num_fds_after_communicate = len(os.listdir(fd_directory)) if p.stdin is not None:
del p self.assertTrue(p.stdin.closed)
num_fds_after_destruction = len(os.listdir(fd_directory)) if p.stdout is not None:
self.assertEqual(num_fds_before_popen, num_fds_after_destruction) self.assertTrue(p.stdout.closed)
self.assertEqual(num_fds_before_popen, num_fds_after_communicate) if p.stderr is not None:
self.assertTrue(p.stderr.closed)
def test_communicate_returns(self): def test_communicate_returns(self):
# communicate() should return None if no redirection is active # communicate() should return None if no redirection is active
......
...@@ -11,6 +11,9 @@ Core and Builtins ...@@ -11,6 +11,9 @@ Core and Builtins
Library Library
------- -------
- Issue #10763: subprocess.communicate() closes stdout and stderr if both are
pipes (bug specific to Windows).
- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better - Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better
compliance (no "s around encoded values). compliance (no "s around encoded values).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment