From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 12 Jun 2019 19:10:44 +0000 (-0700)
Subject: Make asyncio stream sendfile fail on error (was hang) (GH-14025)
X-Git-Tag: v3.8.0b2~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3955dfff600dc8568e71ca19a48c72555043081f;p=thirdparty%2FPython%2Fcpython.git

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>
---

diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 74e385524dd5..a1c62ecee662 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():