diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-10-17 16:13:37 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-17 16:13:37 (GMT) |
commit | 3adf23471ee951a435f2ffa336a52bc6800a209a (patch) | |
tree | 37f82d7a1da7739020a35960c22330cc574157b8 /Lib/test/test_asyncio/test_sendfile.py | |
parent | 26307384ffd14d9086ff7aad36ab1fdc408fe6ab (diff) | |
download | cpython-3adf23471ee951a435f2ffa336a52bc6800a209a.zip cpython-3adf23471ee951a435f2ffa336a52bc6800a209a.tar.gz cpython-3adf23471ee951a435f2ffa336a52bc6800a209a.tar.bz2 |
gh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallback_close_peer_in_the_middle_of_receiving (GH-98316)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
(cherry picked from commit 3e82ad05b18d004e4d01fdb643344d6a2bf11900)
Co-authored-by: fancidev <fancidev@gmail.com>
Diffstat (limited to 'Lib/test/test_asyncio/test_sendfile.py')
-rw-r--r-- | Lib/test/test_asyncio/test_sendfile.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py index effca66..aaaad9d 100644 --- a/Lib/test/test_asyncio/test_sendfile.py +++ b/Lib/test/test_asyncio/test_sendfile.py @@ -1,6 +1,7 @@ """Tests for sendfile functionality.""" import asyncio +import errno import os import socket import sys @@ -484,8 +485,17 @@ class SendfileMixin(SendfileBase): srv_proto, cli_proto = self.prepare_sendfile(close_after=1024) with self.assertRaises(ConnectionError): - self.run_loop( - self.loop.sendfile(cli_proto.transport, self.file)) + try: + self.run_loop( + self.loop.sendfile(cli_proto.transport, self.file)) + except OSError as e: + # macOS may raise OSError of EPROTOTYPE when writing to a + # socket that is in the process of closing down. + if e.errno == errno.EPROTOTYPE and sys.platform == "darwin": + raise ConnectionError + else: + raise + self.run_loop(srv_proto.done) self.assertTrue(1024 <= srv_proto.nbytes < len(self.DATA), |