Skip to content

gh-108342: Make ssl TestPreHandshakeClose more reliable #108370

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

Merged
vstinner merged 3 commits into from
Aug 23, 2023
Merged

gh-108342: Make ssl TestPreHandshakeClose more reliable #108370

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51e1e09
gh-108342: Make ssl TestPreHandshakeClose more reliable
vstinner Aug 23, 2023
c62c680
Address Gregory's review
vstinner Aug 23, 2023
16149b2
correct comment text.
gpshead Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address Gregory's review
  • Loading branch information
@vstinner
vstinner committed Aug 23, 2023
commit c62c6806eb1b76483279657279a10c8e59d049cc
7 changes: 5 additions & 2 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4809,7 +4809,7 @@ def call_after_accept(conn_to_client):

# This forces an immediate connection close via RST on .close().
set_socket_so_linger_on_with_zero_timeout(conn_to_client)
conn_to_client.sendall(
conn_to_client.send(
b"HTTP/1.0 307 Temporary Redirect\r\n"
b"Location: https://example.com/someone-elses-server\r\n"
b"\r\n")
Expand Down Expand Up @@ -4862,7 +4862,10 @@ def test_https_client_non_tls_response_ignored(self):

class SynchronizedHTTPSConnection(http.client.HTTPSConnection):
def connect(self):
super().connect()
# Call clear text HTTP connect(), not the encrypted HTTPS (TLS)
# # connect(): wrap_socket() is called manually above.
http.client.HTTPConnection.connect(self)

# Wait for our fault injection server to have done its thing.
if not server_responding.wait(support.SHORT_TIMEOUT) and support.verbose:
sys.stdout.write("server_responding event never set.")
Expand Down