summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_asyncio
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-08-09 22:21:58 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-08-09 22:21:58 (GMT)
commit131426ebe34f7781c3ab1e213ed4f521bf7cc2e0 (patch)
treef4cf36aff2f36f29a629e2edaf22a263fe7941c7 /Lib/test/test_asyncio
parent89e51221b6ab5cef06be02a5da79b23b6040d95f (diff)
parent9632ea2f26831ae3bbf41ca570d6e138c2f13656 (diff)
downloadcpython-131426ebe34f7781c3ab1e213ed4f521bf7cc2e0.zip
cpython-131426ebe34f7781c3ab1e213ed4f521bf7cc2e0.tar.gz
cpython-131426ebe34f7781c3ab1e213ed4f521bf7cc2e0.tar.bz2
Merge 3.4 (issues #24835, #24763)
Diffstat (limited to 'Lib/test/test_asyncio')
-rw-r--r--Lib/test/test_asyncio/test_subprocess.py6
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
index d138c26..38f0cee 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -417,7 +417,11 @@ class SubprocessMixin:
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