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

Fri Jul 31 23:37:39 CEST 2015

https://hg.python.org/cpython/rev/743b3058295d
changeset: 97172:743b3058295d
branch: 3.5
parent: 97169:94b43b36e464
parent: 97171:6703ac68bf49
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Jul 31 23:36:15 2015 +0200
summary:
 Merge 3.4 (asyncio test)
files:
 Lib/test/test_asyncio/test_subprocess.py | 6 +++++-
 1 files changed, 5 insertions(+), 1 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
@@ -417,7 +417,11 @@
 def test_popen_error(self):
 # Issue #24763: check that the subprocess transport is closed
 # when BaseSubprocessTransport fails
- with mock.patch('subprocess.Popen') as popen:
+ if sys.platform == 'win32':
+ target = 'asyncio.windows_utils.Popen'
+ else:
+ target = 'subprocess.Popen'
+ with mock.patch(target) as popen:
 exc = ZeroDivisionError
 popen.side_effect = exc
 
-- 
Repository URL: https://hg.python.org/cpython
