(Merge 3.4) asyncio, tulip issue 190: Process.communicate() must ignore

BrokenPipeError

If you want to handle the BrokenPipeError, you can easily reimplement
communicate().

Add also a unit test to ensure that stdin.write() + stdin.drain() raises
BrokenPipeError.
This commit is contained in:
Victor Stinner 2014-07-17 12:48:33 +02:00
commit 0d35741b16
3 changed files with 32 additions and 8 deletions

View file

@ -143,7 +143,11 @@ class Process:
if self._loop.get_debug():
logger.debug('%r communicate: feed stdin (%s bytes)',
self, len(input))
yield from self.stdin.drain()
try:
yield from self.stdin.drain()
except BrokenPipeError:
# ignore BrokenPipeError
pass
if self._loop.get_debug():
logger.debug('%r communicate: close stdin', self)

View file

@ -11,9 +11,6 @@ if sys.platform != 'win32':
# Program blocking
PROGRAM_BLOCKED = [sys.executable, '-c', 'import time; time.sleep(3600)']
# Program sleeping during 1 second
PROGRAM_SLEEP_1SEC = [sys.executable, '-c', 'import time; time.sleep(1)']
# Program copying input to output
PROGRAM_CAT = [
sys.executable, '-c',
@ -118,16 +115,32 @@ class SubprocessMixin:
returncode = self.loop.run_until_complete(proc.wait())
self.assertEqual(-signal.SIGHUP, returncode)
def test_broken_pipe(self):
def prepare_broken_pipe_test(self):
# buffer large enough to feed the whole pipe buffer
large_data = b'x' * support.PIPE_MAX_SIZE
# the program ends before the stdin can be feeded
create = asyncio.create_subprocess_exec(
*PROGRAM_SLEEP_1SEC,
sys.executable, '-c', 'pass',
stdin=subprocess.PIPE,
loop=self.loop)
proc = self.loop.run_until_complete(create)
with self.assertRaises(BrokenPipeError):
self.loop.run_until_complete(proc.communicate(large_data))
return (proc, large_data)
def test_stdin_broken_pipe(self):
proc, large_data = self.prepare_broken_pipe_test()
# drain() must raise BrokenPipeError
proc.stdin.write(large_data)
self.assertRaises(BrokenPipeError,
self.loop.run_until_complete, proc.stdin.drain())
self.loop.run_until_complete(proc.wait())
def test_communicate_ignore_broken_pipe(self):
proc, large_data = self.prepare_broken_pipe_test()
# communicate() must ignore BrokenPipeError when feeding stdin
self.loop.run_until_complete(proc.communicate(large_data))
self.loop.run_until_complete(proc.wait())