◐ Shell
reader mode source ↗
Skip to content

bpo-37322: Fix ResourceWarning and exception handling in test (GH-25553)#25553

Merged
tiran merged 2 commits into
python:masterfrom
tiran:bpo-37322-resourcewarning
Apr 24, 2021
Merged

bpo-37322: Fix ResourceWarning and exception handling in test (GH-25553)#25553
tiran merged 2 commits into
python:masterfrom
tiran:bpo-37322-resourcewarning

Conversation

@tiran

@tiran tiran commented Apr 23, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

Handle all OSErrors in a single block. OSError also takes care of
SSLError and socket's connection errors.

Partly reverts commit fb7e750. The
threaded connection handler must not raise an unhandled exception.

https://bugs.python.org/issue37322

@tiran tiran added tests Tests in the Lib/test dir skip news needs backport to 3.8 labels Apr 23, 2021
@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@bedevere-bot

bedevere-bot commented Apr 23, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit a3594aab883ba2e1d47ab853c1301d68c66fe2e3 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@tiran

tiran commented Apr 23, 2021

Copy link
Copy Markdown
Member Author

Buildbots failed to trigger, let's try again.

@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@bedevere-bot

bedevere-bot commented Apr 23, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit a3594aab883ba2e1d47ab853c1301d68c66fe2e3 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@tiran tiran mentioned this pull request Apr 23, 2021
Open
@pablogsal pablogsal added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@bedevere-bot

bedevere-bot commented Apr 23, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @pablogsal for commit a3594aab883ba2e1d47ab853c1301d68c66fe2e3 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the Test PR w/ buildbots; report in status section label Apr 23, 2021
@tiran tiran force-pushed the bpo-37322-resourcewarning branch from a3594aa to 04260c4 Compare April 23, 2021 18:06
@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@bedevere-bot

bedevere-bot commented Apr 23, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit 04260c43c5879a7ef3800c045d9dfacab5c225a1 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 23, 2021
@bedevere-bot

bedevere-bot commented Apr 23, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit 62653f2715fc4e8f9c991b867cee5825fc4d0077 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@tiran tiran force-pushed the bpo-37322-resourcewarning branch from 62653f2 to b0b4024 Compare April 24, 2021 04:57
tiran added 2 commits April 24, 2021 06:59
@tiran
bpo-37322: Fix ResourceWarning and exception handling in test …
ca7fe01 
Handle all OSErrors in a single block. OSError also takes care of
SSLError and socket's connection errors.

Partly reverts commit fb7e750. The
threaded connection handler must not raise an unhandled exception.
@tiran
Stabilize and cleanup another TLS 1.3 PHA test …
25fd780 
Revert 73ea546, increase logging, and improve stability of test.
11 hidden items Load more…
@tiran tiran force-pushed the bpo-37322-resourcewarning branch from b0b4024 to 25fd780 Compare April 24, 2021 04:59
@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Apr 24, 2021
@bedevere-bot

bedevere-bot commented Apr 24, 2021

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit 25fd780 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@tiran tiran changed the title bpo-37322: Fix ResourceWarning and exception handling in test Apr 24, 2021
@tiran tiran merged commit c8666cf into python:master Apr 24, 2021
@miss-islington

miss-islington commented Apr 24, 2021

Copy link
Copy Markdown
Contributor

Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖

@tiran tiran deleted the bpo-37322-resourcewarning branch April 24, 2021 07:17
@miss-islington

miss-islington commented Apr 24, 2021

Copy link
Copy Markdown
Contributor

Sorry, @tiran, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c8666cfa7cdc48915a14cd16095a69029720736a 3.9

@miss-islington

miss-islington commented Apr 24, 2021

Copy link
Copy Markdown
Contributor

Sorry @tiran, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c8666cfa7cdc48915a14cd16095a69029720736a 3.8

@bedevere-bot

bedevere-bot commented Apr 24, 2021

Copy link
Copy Markdown

GH-25572 is a backport of this pull request to the 3.9 branch.

@bedevere-bot

bedevere-bot commented Apr 24, 2021

Copy link
Copy Markdown

GH-25573 is a backport of this pull request to the 3.8 branch.

tiran added a commit to tiran/cpython that referenced this pull request May 2, 2021
@tiran
[3.9] bpo-37322: Fix ResourceWarning and exception handling in test (p… …
e08a8bb 
…ythonGH-25553)

Revert 73ea546, increase logging, and improve stability of test.

Handle all OSErrors in a single block. OSError also takes care of
SSLError and socket's connection errors.

Partly reverts commit fb7e750. The
threaded connection handler must not raise an unhandled exception..
(cherry picked from commit c8666cf)

Co-authored-by: Christian Heimes <christian@python.org>
tiran added a commit to tiran/cpython that referenced this pull request May 2, 2021
@tiran
[3.8] bpo-37322: Fix ResourceWarning and exception handling in test (p… …
8b230b9 
…ythonGH-25553)

Revert 73ea546, increase logging, and improve stability of test.

Handle all OSErrors in a single block. OSError also takes care of
SSLError and socket's connection errors.

Partly reverts commit fb7e750. The
threaded connection handler must not raise an unhandled exception..
(cherry picked from commit c8666cf)

Co-authored-by: Christian Heimes <christian@python.org>
@sobolevn sobolevn mentioned this pull request Sep 28, 2023
Open
This was referenced Feb 11, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ethanfurman ethanfurman Awaiting requested review from ethanfurman

@isidentical isidentical Awaiting requested review from isidentical

1 more reviewer

@matthewhughes934 matthewhughes934 matthewhughes934 left review comments

Assignees

@tiran tiran

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tiran @bedevere-bot @miss-islington @matthewhughes934 @pablogsal @the-knights-who-say-ni