[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (issues #24835, #24763)

[yury.selivanov]

https://hg.python.org/cpython/rev/f304ba9425a3
changeset:   97349:f304ba9425a3
parent:      97346:7c78279afc30
parent:      97348:aa527ee0d27f
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Sun Aug 09 18:22:11 2015 -0400
summary:
  Merge 3.5 (issues #24835, #24763)

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