Merge 3.5 (issues #24835, #24763)

This commit is contained in:
Yury Selivanov 2015-08-09 18:22:11 -04:00
commit 31978d9ff4
1 changed files with 5 additions and 1 deletions

View File

@ -417,7 +417,11 @@ class SubprocessMixin:
def test_popen_error(self): def test_popen_error(self):
# Issue #24763: check that the subprocess transport is closed # Issue #24763: check that the subprocess transport is closed
# when BaseSubprocessTransport fails # 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 exc = ZeroDivisionError
popen.side_effect = exc popen.side_effect = exc