8000 [3.8] gh-108342: Make ssl TestPreHandshakeClose more reliable (GH-108370) by ambv · Pull Request #108408 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.8] gh-108342: Make ssl TestPreHandshakeClose more reliable (GH-108370) #108408

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
merged 2 commits into from
Aug 24, 2023
Merged

[3.8] gh-108342: Make ssl TestPreHandshakeClose more reliable (GH-108370) #108408

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb2af9
[3.8] gh-108342: Make ssl TestPreHandshakeClose more reliable (GH-108…
vstinner Aug 23, 2023
45d7564
Fix borked conflict resolution
ambv Aug 24, 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
Fix borked conflict resolution
  • Loading branch information
@ambv
ambv committed Aug 24, 2023
commit 45d75648dedbc4299e4fab255e5d6221ec2d5aeb
9 changes: 2 additions & 7 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5044,15 +5044,10 @@ def call_after_accept(conn_to_client):
timeout = 2.0
server = self.SingleConnectionTestServerThread(
call_after_accept=call_after_accept,
<<<<<<< HEAD
name="non_tls_http_RST_responder")
server.__enter__() # starts it
self.addCleanup(server.__exit__) # ... & unittest.TestCase stops it.
=======
name="non_tls_http_RST_responder",
timeout=timeout)
self.enterContext(server) # starts it & unittest.TestCase stops it.
>>>>>>> 592bacb6fc (gh-108342: Make ssl TestPreHandshakeClose more reliable (#108370))
server.__enter__() # starts it
self.addCleanup(server.__exit__) # ... & unittest.TestCase stops it.
# Redundant; call_after_accept sets SO_LINGER on the accepted conn.
set_socket_so_linger_on_with_zero_timeout(server.listener)

Expand Down
0