[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

[victor.stinner]

https://hg.python.org/cpython/rev/031fc0231f3d
changeset:   94187:031fc0231f3d
parent:      94185:973173ad0fe7
parent:      94186:992ce0dcfb29
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Jan 15 22:53:21 2015 +0100
summary:
  Merge 3.4 (asyncio)

files:
  Lib/test/test_asyncio/test_subprocess.py |  14 ++++++++++-
  1 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -179,6 +179,18 @@
                 'sys.stdout.write("x" * %s)' % size,
                 'sys.stdout.flush()',
             ))
+
+            connect_read_pipe = self.loop.connect_read_pipe
+
+            @asyncio.coroutine
+            def connect_read_pipe_mock(*args, **kw):
+                transport, protocol = yield from connect_read_pipe(*args, **kw)
+                transport.pause_reading = mock.Mock()
+                transport.resume_reading = mock.Mock()
+                return (transport, protocol)
+
+            self.loop.connect_read_pipe = connect_read_pipe_mock
+
             proc = yield from asyncio.create_subprocess_exec(
                                          sys.executable, '-c', code,
                                          stdin=asyncio.subprocess.PIPE,
@@ -186,8 +198,6 @@
                                          limit=limit,
                                          loop=self.loop)
             stdout_transport = proc._transport.get_pipe_transport(1)
-            stdout_transport.pause_reading = mock.Mock()
-            stdout_transport.resume_reading = mock.Mock()
 
             stdout, stderr = yield from proc.communicate()
 

-- 
Repository URL: https://hg.python.org/cpython