summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-06-12 19:10:44 (GMT)
committerGitHub <noreply@github.com>2019-06-12 19:10:44 (GMT)
commit3955dfff600dc8568e71ca19a48c72555043081f (patch)
treeec2d5d5d950ee91d2a8a204ed028f1fc1c1e1f0e
parentf72886a066ba7d3a3aa077cfc3cad2ca0b2cdbf6 (diff)
downloadcpython-3955dfff600dc8568e71ca19a48c72555043081f.zip
cpython-3955dfff600dc8568e71ca19a48c72555043081f.tar.gz
cpython-3955dfff600dc8568e71ca19a48c72555043081f.tar.bz2
Make asyncio stream sendfile fail on error (was hang) (GH-14025)
(cherry picked from commit 0d1942774a70d561dbaaa980742dd0927e8aa51a) Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
-rw-r--r--Lib/test/test_asyncio/test_streams.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 74e3855..a1c62ec 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -1656,22 +1656,25 @@ os.close(fd)
async def serve_callback(stream):
data = await stream.readline()
- self.assertEqual(data, b'begin\n')
+ await stream.write(b'ack-' + data)
data = await stream.readline()
- self.assertEqual(data, b'data\n')
+ await stream.write(b'ack-' + data)
data = await stream.readline()
- self.assertEqual(data, b'end\n')
- await stream.write(b'done\n')
+ await stream.write(b'ack-' + data)
await stream.close()
async def do_connect(host, port):
stream = await asyncio.connect(host, port)
await stream.write(b'begin\n')
+ data = await stream.readline()
+ self.assertEqual(b'ack-begin\n', data)
with open(support.TESTFN, 'rb') as fp:
await stream.sendfile(fp)
+ data = await stream.readline()
+ self.assertEqual(b'ack-data\n', data)
await stream.write(b'end\n')
data = await stream.readline()
- self.assertEqual(data, b'done\n')
+ self.assertEqual(data, b'ack-end\n')
await stream.close()
async def test():