Skip to content

gh-160217: Fix premature client socket cleanup in test_socket #160218

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

Open
NikitaMikhailov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

gh-160217: Fix premature client socket cleanup in test_socket #160218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f124c
Fix premature client socket cleanup in test_socket
NikitaMikhailov Oct 22, 2026
5298e86
Merge branch 'main' into codex/socket-client-cleanup-race
NikitaMikhailov Nov 3, 2026
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
7 changes: 2 additions & 5 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6156,6 +6156,8 @@ def clientSetUp(self):
self.source_port = socket_helper.find_unused_port()

def clientTearDown(self):
# TestCase cleanups run in the server thread and could close the
# socket while the client thread is still using it.
if self.cli is not None:
self.cli.close()
self.cli = None
Expand All @@ -6169,15 +6171,13 @@ def _justAccept(self):
def _testFamily(self):
self.cli = socket.create_connection((HOST, self.port),
timeout=support.LOOPBACK_TIMEOUT)
self.addCleanup(self.cli.close)
self.assertEqual(self.cli.family, 2)

testSourceAddress = _justAccept
def _testSourceAddress(self):
self.cli = socket.create_connection((HOST, self.port),
timeout=support.LOOPBACK_TIMEOUT,
source_address=('', self.source_port))
self.addCleanup(self.cli.close)
self.assertEqual(self.cli.getsockname()[1], self.source_port)
# The port number being used is sufficient to show that the bind()
# call happened.
Expand All @@ -6189,7 +6189,6 @@ def _testTimeoutDefault(self):
socket.setdefaulttimeout(42)
try:
self.cli = socket.create_connection((HOST, self.port))
self.addCleanup(self.cli.close)
finally:
socket.setdefaulttimeout(None)
self.assertEqual(self.cli.gettimeout(), 42)
Expand All @@ -6201,7 +6200,6 @@ def _testTimeoutNone(self):
socket.setdefaulttimeout(30)
try:
self.cli = socket.create_connection((HOST, self.port), timeout=None)
self.addCleanup(self.cli.close)
finally:
socket.setdefaulttimeout(None)
self.assertEqual(self.cli.gettimeout(), None)
Expand All @@ -6214,7 +6212,6 @@ def _testTimeoutValueNamed(self):
testTimeoutValueNonamed = _justAccept
def _testTimeoutValueNonamed(self):
self.cli = socket.create_connection((HOST, self.port), 30)
self.addCleanup(self.cli.close)
self.assertEqual(self.cli.gettimeout(), 30)


Expand Down
Loading