NotificationsYou must be signed in to change notification settings
Fork33.4k
Star69.8k

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

gvanrossum merged 4 commits intopython:mainfromfancidev:fix-issue-98174

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 intopython:mainfromfancidev:fix-issue-98174

Oct 17, 2022

Conversation

Copy link

Contributor

fancidev commentedOct 16, 2022•
edited by bedevere-bot
Loading

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

This PR updates the test casetest_sendfile_fallback_close_peer_in_the_middle_of_receiving to handle this possibility in addition toConnectionError.

Issue:test_sendfile_fallback_close_peer_in_the_middle_of_receiving false failure on macOS #98174

Handle EPROTOTYPE under macOS in test_sendfile_fallback_close_peer_in…

9c945e3

…_the_middle_of_receiving.

fancidev requested review from1st1,asvetlov andgvanrossum ascode owners

October 16, 2022 04:09

bedevere-bot added awaiting review testsTests in the Lib/test dir labels

Oct 16, 2022

Copy link

bedevere-bot commentedOct 16, 2022

Most changes to Pythonrequire a NEWS entry.

Please add it using theblurb_it web app or theblurb command-line tool.

Copy link

ghost commentedOct 16, 2022•
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.

📜🤖 Added by blurb_it.

7747f31

sobolevn reviewed

Oct 16, 2022

View reviewed changes

Misc/NEWS.d/next/Tests/2022-10-16-06-42-01.gh-issue-98174.msZY0C.rst Outdated

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

Member

sobolevnOct 16, 2022

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

Lib/test/test_asyncio/test_sendfile.py OutdatedShow resolvedHide resolved

fancidevand others added2 commits

October 17, 2022 20:43

No need to raise 'from' within except block.

cf9178a

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

NEWS entry not needed for changes to test cases.

614d6a5

Copy link

bedevere-bot commentedOct 17, 2022

Most changes to Pythonrequire a NEWS entry.

Please add it using theblurb_it web app or theblurb command-line tool.

Copy link

ContributorAuthor

fancidev commentedOct 17, 2022

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

AlexWaygood added the skip news label

Oct 17, 2022

gvanrossum approved these changes

Oct 17, 2022

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting review labels

Oct 17, 2022

gvanrossum merged commit3e82ad0 intopython:main

Oct 17, 2022

bedevere-bot removed the awaiting merge label

Oct 17, 2022

Copy link

Member

gvanrossum commentedOct 17, 2022

Should this be backported to 3.11 and 3.10?

gvanrossum added needs backport to 3.10

only security fixes

needs backport to 3.11only security fixes labels

Oct 17, 2022

Copy link

Contributor

miss-islington commentedOct 17, 2022

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

Copy link

Contributor

miss-islington commentedOct 17, 2022

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

pythongh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallba…

8500564

…ck_close_peer_in_the_middle_of_receiving (pythonGH-98316)Co-authored-by: Nikita Sobolev <mail@sobolevn.me>(cherry picked from commit3e82ad0)Co-authored-by: fancidev <fancidev@gmail.com>

Copy link

bedevere-bot commentedOct 17, 2022

GH-98356 is a backport of this pull request to the3.10 branch.

bedevere-bot removed the needs backport to 3.10only security fixes label

Oct 17, 2022

Copy link

bedevere-bot commentedOct 17, 2022

GH-98357 is a backport of this pull request to the3.11 branch.

bedevere-bot removed the needs backport to 3.11only security fixes label

Oct 17, 2022

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request

Oct 17, 2022

pythongh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallba…

29f4a44

…ck_close_peer_in_the_middle_of_receiving (pythonGH-98316)Co-authored-by: Nikita Sobolev <mail@sobolevn.me>(cherry picked from commit3e82ad0)Co-authored-by: fancidev <fancidev@gmail.com>

miss-islington added a commit that referenced this pull request

Oct 17, 2022

gh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallback_clo…

3adf234

…se_peer_in_the_middle_of_receiving (GH-98316)Co-authored-by: Nikita Sobolev <mail@sobolevn.me>(cherry picked from commit3e82ad0)Co-authored-by: fancidev <fancidev@gmail.com>

carljm added a commit to carljm/cpython that referenced this pull request

Oct 17, 2022

Merge branch 'main' into typewatch

cdbe93b

* 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

[3.11]gh-98174: Handle EPROTOTYPE under macOS in test_sendfile_fallb…

0bba980

…ack_close_peer_in_the_middle_of_receiving (GH-98316) (#98357)Co-authored-by: Nikita Sobolev <mail@sobolevn.me>(cherry picked from commit3e82ad0)Co-authored-by: fancidev <fancidev@gmail.com>