diff options
| author | Ee Durbin <ewdurbin@gmail.com> | 2023-09-07 18:13:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 18:13:32 (GMT) |
| commit | 1829a3c9a3712b6a68a3a449e4a08787c73da51d (patch) | |
| tree | 8c64e9cfe2e1fda25e0445e3dbd151a2a5320e81 | |
| parent | f9f085c326cdaa34ebb3ca018228a63825b12122 (diff) | |
| download | cpython-1829a3c9a3712b6a68a3a449e4a08787c73da51d.zip cpython-1829a3c9a3712b6a68a3a449e4a08787c73da51d.tar.gz cpython-1829a3c9a3712b6a68a3a449e4a08787c73da51d.tar.bz2 | |
gh-75743: Restore test_timeout.testConnectTimeout() (#109087)
This un-skips this test now that pythontest.net implements appropriate firewall
rules for it.
| -rw-r--r-- | Lib/test/test_timeout.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py index 30e843a..35ff56f 100644 --- a/Lib/test/test_timeout.py +++ b/Lib/test/test_timeout.py @@ -148,13 +148,12 @@ class TCPTimeoutTestCase(TimeoutTestCase): def tearDown(self): self.sock.close() - @unittest.skipIf(True, 'need to replace these hosts; see bpo-35518') 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 # from Python because it's a function of the underlying TCP/IP stack. - # So, the following Snakebite host has been defined: - blackhole = resolve_address('blackhole.snakebite.net', 56666) + # So, the following port on the pythontest.net host has been defined: + blackhole = resolve_address('pythontest.net', 56666) # Blackhole has been configured to silently drop any incoming packets. # 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 # our confidence in testing the blackhole, a corresponding 'whitehole' # 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 # packets as well, but it does it respectfully with regards to the @@ -180,20 +179,15 @@ class TCPTimeoutTestCase(TimeoutTestCase): # timeframe). # 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" - # - # blackhole_ip="35.8.247.6" - # whitehole_ip="35.8.247.6" - # 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 + # -A INPUT -p tcp --destination-port 56666 -j DROP + # -A INPUT -p udp --destination-port 56666 -j DROP + # -A INPUT -p tcp --destination-port 56667 -j REJECT + # -A INPUT -p udp --destination-port 56667 -j REJECT # + # See https://github.com/python/psf-salt/blob/main/pillar/base/firewall/snakebite.sls + # for the current configuration. skip = True sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) |