Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

bpo-43921: Fix test_ssl.test_pha_required_nocert() #26489

Merged
merged 1 commit into from
Jun 2, 2021
Merged

bpo-43921: Fix test_ssl.test_pha_required_nocert() #26489

merged 1 commit into from
Jun 2, 2021

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Jun 2, 2021 •
edited by bedevere-bot
Loading

Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).

https://bugs.python.org/issue43921

@vstinner
bpo-43921: Fix test_ssl.test_pha_required_nocert()
df53b84 
Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).
@vstinner vstinner requested a review from tiran as a code owner June 2, 2021 15:42
@bedevere-bot bedevere-bot added awaiting core review tests Tests in the Lib/test dir labels Jun 2, 2021
@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

Without this change, python -m test test_ssl -u all -v -F -j5 -m test_pha_required_nocert fails in less than 2 minutes.

With this change, the command didn't fail, I ran it for like 30 minutes.

@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

cc @tiran @pablogsal: I plan to merge this fix tomorrow, test_ssl random failures are super annoying, and I'm sure that this change fix the issue (I ran a functional test, see my previous comment).

@tiran
Copy link
Member

tiran commented Jun 2, 2021

LGTM, although it's more of a patch than a proper fix. The test connection should not fail with an EOF error. There is some foul play. It's good enough for me.

@tiran tiran added the needs backport to 3.10 only security fixes label Jun 2, 2021
@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

The test connection should not fail with an EOF error.

I don't have the bandwidth to investigate that. I'm just an employee who like to see a green CI. The EOF check was already there before my change :-p

@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

If someone wants to enhance the test, I would suggest to check for TLS alerts, rather than checking how the client socket fails or how it's closed.

@vstinner vstinner merged commit 320eaa7 into python:main Jun 2, 2021
@vstinner vstinner deleted the pha_required_nocert branch June 2, 2021 20:29
@vstinner vstinner added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jun 2, 2021
@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

Come on little bot, you can do it! I believe in you!

@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

@miss-islington: knock knock knock

@vstinner vstinner mentioned this pull request Jun 2, 2021
Closed
@vstinner
Copy link
Member Author

vstinner commented Jun 2, 2021

The backport PR is not created automatically :-( python/miss-islington#462

@Mariatta Mariatta added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jun 2, 2021
@miss-islington
Copy link
Contributor

Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@Mariatta Mariatta added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jun 2, 2021
@miss-islington
Copy link
Contributor

Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jun 2, 2021
@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 2, 2021
@vstinner @miss-islington
bpo-43921: Fix test_ssl.test_pha_required_nocert() (pythonGH-26489)
e9f209d 
Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).
(cherry picked from commit 320eaa7)

Co-authored-by: Victor Stinner <vstinner@python.org>
miss-islington added a commit that referenced this pull request Jun 2, 2021
@miss-islington @vstinner
bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489)
e5e93e6 
Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).
(cherry picked from commit 320eaa7)

Co-authored-by: Victor Stinner <vstinner@python.org>
@vstinner vstinner mentioned this pull request Jun 3, 2021
Merged
@pablogsal pablogsal mentioned this pull request Jul 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal pablogsal approved these changes

@tiran tiran Awaiting requested review from tiran

Assignees
No one assigned
Labels
tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@vstinner @tiran @miss-islington @bedevere-bot @pablogsal @Mariatta @the-knights-who-say-ni