Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

gh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallback_close_peer_in_the_middle_of_receiving#98316

Merged
gvanrossum merged 4 commits into
python:mainpython/cpython:mainfrom
fancidev:fix-issue-98174fancidev/cpython:fix-issue-98174Copy head branch name to clipboard
Oct 17, 2022
Merged

gh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallback_close_peer_in_the_middle_of_receiving#98316
gvanrossum merged 4 commits into
python:mainpython/cpython:mainfrom
fancidev:fix-issue-98174fancidev/cpython:fix-issue-98174Copy head branch name to clipboard

Conversation

@fancidev

@fancidev fancidev commented Oct 16, 2022

Copy link
Copy Markdown
Contributor

macOS may raise OSError of EPROTOTYPE when writing to a socket that is in the middle of closing down. See also http://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/

This PR updates the test case test_sendfile_fallback_close_peer_in_the_middle_of_receiving to handle this possibility in addition to ConnectionError.

@bedevere-bot bedevere-bot added awaiting review tests Tests in the Lib/test dir labels Oct 16, 2022
@bedevere-bot

Copy link
Copy Markdown

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

@ghost

ghost commented Oct 16, 2022

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@@ -0,0 +1 @@
Update test case `test_sendfile_fallback_close_peer_in_the_middle_of_receiving` to handle `OSError` of `EPROTOTYPE` on macOS.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test only changes do not need NEWS entries.
They are for user-facing things :)

Comment thread Lib/test/test_asyncio/test_sendfile.py Outdated
@bedevere-bot

Copy link
Copy Markdown

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

@fancidev

Copy link
Copy Markdown
Contributor Author

@sobolevn, thanks for reviewing! I also removed the NEWS entry. Hope it's good now!

@gvanrossum

Copy link
Copy Markdown
Member

Should this be backported to 3.11 and 3.10?

@gvanrossum gvanrossum added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 17, 2022
@miss-islington

Copy link
Copy Markdown
Contributor

Thanks @fancidev for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington

Copy link
Copy Markdown
Contributor

Thanks @fancidev for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 17, 2022
…ck_close_peer_in_the_middle_of_receiving (pythonGH-98316)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
(cherry picked from commit 3e82ad0)

Co-authored-by: fancidev <fancidev@gmail.com>
@bedevere-bot

Copy link
Copy Markdown

GH-98356 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Oct 17, 2022
@bedevere-bot

Copy link
Copy Markdown

GH-98357 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 17, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 17, 2022
…ck_close_peer_in_the_middle_of_receiving (pythonGH-98316)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
(cherry picked from commit 3e82ad0)

Co-authored-by: fancidev <fancidev@gmail.com>
miss-islington added a commit that referenced this pull request Oct 17, 2022
…se_peer_in_the_middle_of_receiving (GH-98316)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
(cherry picked from commit 3e82ad0)

Co-authored-by: fancidev <fancidev@gmail.com>
carljm added a commit to carljm/cpython that referenced this pull request Oct 17, 2022
* main: (31 commits)
  pythongh-95913: Move subinterpreter exper removal to 3.11 WhatsNew (pythonGH-98345)
  pythongh-95914: Add What's New item describing PEP 670 changes (python#98315)
  Remove unused arrange_output_buffer function from zlibmodule.c. (pythonGH-98358)
  pythongh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallback_close_peer_in_the_middle_of_receiving (python#98316)
  pythonGH-98327: Reduce scope of catch_warnings() in _make_subprocess_transport (python#98333)
  pythongh-93691: Compiler's code-gen passes location around instead of holding it on the global compiler state (pythonGH-98001)
  pythongh-97669: Create Tools/build/ directory (python#97963)
  pythongh-95534: Improve gzip reading speed by 10% (python#97664)
  pythongh-95913: Forward-port int/str security change to 3.11 What's New in main (python#98344)
  pythonGH-91415: Mention alphabetical sort ordering in the Sorting HOWTO (pythonGH-98336)
  pythongh-97930: Merge with importlib_resources 5.9 (pythonGH-97929)
  pythongh-85525: Remove extra row in doc (python#98337)
  pythongh-85299: Add note warning about entry point guard for asyncio example (python#93457)
  pythongh-97527: IDLE - fix buggy macosx patch (python#98313)
  pythongh-98307: Add docstring and documentation for SysLogHandler.createSocket (pythonGH-98319)
  pythongh-94808: Cover `PyFunction_GetCode`, `PyFunction_GetGlobals`, `PyFunction_GetModule` (python#98158)
  pythonGH-94597: Deprecate child watcher getters and setters (python#98215)
  pythongh-98254: Include stdlib module names in error messages for NameErrors (python#98255)
  Improve speed. Reduce auxiliary memory to 16.6% of the main array. (pythonGH-98294)
  [doc] Update logging cookbook with an example of custom handling of levels. (pythonGH-98290)
  ...
gvanrossum pushed a commit that referenced this pull request Oct 18, 2022
…ack_close_peer_in_the_middle_of_receiving (GH-98316) (#98357)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
(cherry picked from commit 3e82ad0)

Co-authored-by: fancidev <fancidev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.