Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-75743: Restore test_timeout.testConnectTimeout() (#109087) 

This un-skips this test now that pythontest.net implements appropriate firewall
rules for it.
This commit is contained in:
Ee Durbin 2023-09-07 14:13:32 -04:00 committed by GitHub
parent f9f085c326
commit 1829a3c9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Lib/test/test_timeout.py
View File

@ -148,13 +148,12 @@ class TCPTimeoutTestCase(TimeoutTestCase):
def tearDown(self): def tearDown(self):
self.sock.close() self.sock.close()
@unittest.skipIf(True, 'need to replace these hosts; see bpo-35518')
def testConnectTimeout(self): def testConnectTimeout(self):
# Testing connect timeout is tricky: we need to have IP connectivity # Testing connect timeout is tricky: we need to have IP connectivity
# to a host that silently drops our packets. We can't simulate this # to a host that silently drops our packets. We can't simulate this
# from Python because it's a function of the underlying TCP/IP stack. # from Python because it's a function of the underlying TCP/IP stack.
# So, the following Snakebite host has been defined: # So, the following port on the pythontest.net host has been defined:
blackhole = resolve_address('blackhole.snakebite.net', 56666) blackhole = resolve_address('pythontest.net', 56666)
# Blackhole has been configured to silently drop any incoming packets. # Blackhole has been configured to silently drop any incoming packets.
# No RSTs (for TCP) or ICMP UNREACH (for UDP/ICMP) will be sent back # No RSTs (for TCP) or ICMP UNREACH (for UDP/ICMP) will be sent back
@ -166,7 +165,7 @@ class TCPTimeoutTestCase(TimeoutTestCase):
# to firewalling or general network configuration. In order to improve # to firewalling or general network configuration. In order to improve
# our confidence in testing the blackhole, a corresponding 'whitehole' # our confidence in testing the blackhole, a corresponding 'whitehole'
# has also been set up using one port higher: # has also been set up using one port higher:
whitehole = resolve_address('whitehole.snakebite.net', 56667) whitehole = resolve_address('pythontest.net', 56667)
# This address has been configured to immediately drop any incoming # This address has been configured to immediately drop any incoming
# packets as well, but it does it respectfully with regards to the # packets as well, but it does it respectfully with regards to the
@ -180,20 +179,15 @@ class TCPTimeoutTestCase(TimeoutTestCase):
# timeframe). # timeframe).
# For the records, the whitehole/blackhole configuration has been set # For the records, the whitehole/blackhole configuration has been set
# up using the 'pf' firewall (available on BSDs), using the following: # up using the 'iptables' firewall, using the following rules:
# #
# ext_if="bge0" # -A INPUT -p tcp --destination-port 56666 -j DROP
# # -A INPUT -p udp --destination-port 56666 -j DROP
# blackhole_ip="35.8.247.6" # -A INPUT -p tcp --destination-port 56667 -j REJECT
# whitehole_ip="35.8.247.6" # -A INPUT -p udp --destination-port 56667 -j REJECT
# blackhole_port="56666"
# whitehole_port="56667"
#
# block return in log quick on $ext_if proto { tcp udp } \
# from any to $whitehole_ip port $whitehole_port
# block drop in log quick on $ext_if proto { tcp udp } \
# from any to $blackhole_ip port $blackhole_port
# #
# See https://github.com/python/psf-salt/blob/main/pillar/base/firewall/snakebite.sls
# for the current configuration.
skip = True skip = True
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)