gh-132535: Fix resource warnings in test_timeout (GH-132572)

They were emitted if internet connection was not available.
This commit is contained in:
Serhiy Storchaka 2025-04-16 10:20:07 +03:00 committed by GitHub
parent 4b15d105a2
commit 82f74eb234
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -26,10 +26,8 @@ class CreationTestCase(unittest.TestCase):
"""Test case for socket.gettimeout() and socket.settimeout()"""
def setUp(self):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
def tearDown(self):
self.sock.close()
self.sock = self.enterContext(
socket.socket(socket.AF_INET, socket.SOCK_STREAM))
def testObjectCreation(self):
# Test Socket creation
@ -113,8 +111,6 @@ class TimeoutTestCase(unittest.TestCase):
def setUp(self):
raise NotImplementedError()
tearDown = setUp
def _sock_operation(self, count, timeout, method, *args):
"""
Test the specified socket method.
@ -142,12 +138,10 @@ class TCPTimeoutTestCase(TimeoutTestCase):
"""TCP test case for socket.socket() timeout functions"""
def setUp(self):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock = self.enterContext(
socket.socket(socket.AF_INET, socket.SOCK_STREAM))
self.addr_remote = resolve_address('www.python.org.', 80)
def tearDown(self):
self.sock.close()
def testConnectTimeout(self):
# Testing connect timeout is tricky: we need to have IP connectivity
# to a host that silently drops our packets. We can't simulate this
@ -190,19 +184,16 @@ class TCPTimeoutTestCase(TimeoutTestCase):
# for the current configuration.
skip = True
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
timeout = support.LOOPBACK_TIMEOUT
sock.settimeout(timeout)
try:
sock.connect((whitehole))
except TimeoutError:
pass
except OSError as err:
if err.errno == errno.ECONNREFUSED:
skip = False
finally:
sock.close()
del sock
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
try:
timeout = support.LOOPBACK_TIMEOUT
sock.settimeout(timeout)
sock.connect((whitehole))
except TimeoutError:
pass
except OSError as err:
if err.errno == errno.ECONNREFUSED:
skip = False
if skip:
self.skipTest(
@ -269,10 +260,8 @@ class UDPTimeoutTestCase(TimeoutTestCase):
"""UDP test case for socket.socket() timeout functions"""
def setUp(self):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
def tearDown(self):
self.sock.close()
self.sock = self.enterContext(
socket.socket(socket.AF_INET, socket.SOCK_DGRAM))
def testRecvfromTimeout(self):
# Test recvfrom() timeout