diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-17 12:01:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-17 12:01:39 (GMT) |
| commit | dc2539f957610aa028cc6b60a000e78ec34afb15 (patch) | |
| tree | 9417b705f62b4de6d47cdac5b0344ba49ecbcb82 /Lib/test | |
| parent | edfdf5479057c3ba223234c4fc0165a3abaec44d (diff) | |
| parent | ddc8c8db1cd50d3b86cffbb1070ab32e3a14bbae (diff) | |
| download | cpython-dc2539f957610aa028cc6b60a000e78ec34afb15.zip cpython-dc2539f957610aa028cc6b60a000e78ec34afb15.tar.gz cpython-dc2539f957610aa028cc6b60a000e78ec34afb15.tar.bz2 | |
(Merge 3.4) asyncio: Fix test_stdin_broken_pipe(), drain() can also raise
ConnectionResetError
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_asyncio/test_subprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index e41cabe..d050458 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -130,9 +130,9 @@ class SubprocessMixin: def test_stdin_broken_pipe(self): proc, large_data = self.prepare_broken_pipe_test() - # drain() must raise BrokenPipeError + # drain() must raise BrokenPipeError or ConnectionResetError proc.stdin.write(large_data) - self.assertRaises(BrokenPipeError, + self.assertRaises((BrokenPipeError, ConnectionResetError), self.loop.run_until_complete, proc.stdin.drain()) self.loop.run_until_complete(proc.wait()) |