summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-21 14:23:51 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-07-21 14:23:51 (GMT)
commit38d773bd106d644df7509634dea6ce6ff691561b (patch)
tree2afde07314cb8d8b9975dddd551d6ca28627e84f /Lib
parent56e8c29a4e5f5907e2e170e23d9a57e564401a75 (diff)
parent0dee8ad579c57ee533251004f66f1f4c6fee1691 (diff)
downloadcpython-38d773bd106d644df7509634dea6ce6ff691561b.zip
cpython-38d773bd106d644df7509634dea6ce6ff691561b.tar.gz
cpython-38d773bd106d644df7509634dea6ce6ff691561b.tar.bz2
(Merge 3.4) asyncio: Fix test_stdin_broken_pipe(), drain() is not a coroutine
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_asyncio/test_subprocess.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 5425d9b..a4e9df2 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -141,10 +141,15 @@ class SubprocessMixin:
def test_stdin_broken_pipe(self):
proc, large_data = self.prepare_broken_pipe_test()
+ @asyncio.coroutine
+ def write_stdin(proc, data):
+ proc.stdin.write(data)
+ yield from proc.stdin.drain()
+
+ coro = write_stdin(proc, large_data)
# drain() must raise BrokenPipeError or ConnectionResetError
- proc.stdin.write(large_data)
self.assertRaises((BrokenPipeError, ConnectionResetError),
- self.loop.run_until_complete, proc.stdin.drain())
+ self.loop.run_until_complete, coro)
self.loop.run_until_complete(proc.wait())
def test_communicate_ignore_broken_pipe(self):