Skip to content

Commit e96ffa9

Browse files
committed
Merge bitcoin/bitcoin#31142: test: fix intermittent failure in p2p_seednode.py, don't connect to random IPs
6c9fe7b test: Prevent connection attempts to random IPs in p2p_seednodes.py (Martin Zumsande) bb97b1f test: fix intermittent timeout in p2p_seednodes.py (Martin Zumsande) Pull request description: Fixes #31103 On some CI runs, the seed node timer in `ThreadOpenConnection` was only started *after* the mocktime was set. Fix this by waiting for the first connection attempt, which happens after the timer was started. Also I noticed that the "unreachable" connections are not in fact unreachable, so that the functional test could attempt connections to random IPs on the internet. This was already noted in bitcoin/bitcoin#29605 (comment) but the suggested fix never made it in, so I added it to this PR. ACKs for top commit: sr-gi: tACK [6c9fe7b](bitcoin/bitcoin@6c9fe7b) laanwj: Code review ACK 6c9fe7b tdb3: cr and light test ACK 6c9fe7b Tree-SHA512: 021b6d5325eab85d79708b4b137f61723a36f2b8a1faf681463bad2ea5283ea528b5ff1701467a86b035d3a6972750a61ace5020e58b7aa61ecaad97664488c8
2 parents 54c4b09 + 6c9fe7b commit e96ffa9

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

test/functional/p2p_seednode.py

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ def set_test_params(self):
2020
self.disable_autoconnect = False
2121

2222
def test_no_seednode(self):
23-
# Check that if no seednode is provided, the node proceeds as usual (without waiting)
23+
self.log.info("Check that if no seednode is provided, the node proceeds as usual (without waiting)")
2424
with self.nodes[0].assert_debug_log(expected_msgs=[], unexpected_msgs=["Empty addrman, adding seednode", f"Couldn't connect to peers from addrman after {ADD_NEXT_SEEDNODE} seconds. Adding seednode"], timeout=ADD_NEXT_SEEDNODE):
2525
self.restart_node(0)
2626

2727
def test_seednode_empty_addrman(self):
2828
seed_node = "0.0.0.1"
29-
# Check that the seednode is added to m_addr_fetches on bootstrap on an empty addrman
29+
self.log.info("Check that the seednode is immediately added on bootstrap on an empty addrman")
3030
with self.nodes[0].assert_debug_log(expected_msgs=[f"Empty addrman, adding seednode ({seed_node}) to addrfetch"], timeout=ADD_NEXT_SEEDNODE):
3131
self.restart_node(0, extra_args=[f'-seednode={seed_node}'])
3232

33-
def test_seednode_addrman_unreachable_peers(self):
33+
def test_seednode_non_empty_addrman(self):
34+
self.log.info("Check that if addrman is non-empty, seednodes are queried with a delay")
3435
seed_node = "0.0.0.2"
3536
node = self.nodes[0]
3637
# Fill the addrman with unreachable nodes
@@ -39,17 +40,18 @@ def test_seednode_addrman_unreachable_peers(self):
3940
port = 8333 + i
4041
node.addpeeraddress(ip, port)
4142

42-
# Restart the node so seednode is processed again
43+
# Restart the node so seednode is processed again. Specify a non-working proxy to make sure no actual connections to random IPs are attempted.
44+
with node.assert_debug_log(expected_msgs=["trying v1 connection"], timeout=ADD_NEXT_SEEDNODE):
45+
self.restart_node(0, extra_args=[f'-seednode={seed_node}', '-proxy=127.0.0.1:1'])
46+
4347
with node.assert_debug_log(expected_msgs=[f"Couldn't connect to peers from addrman after {ADD_NEXT_SEEDNODE} seconds. Adding seednode ({seed_node}) to addrfetch"], unexpected_msgs=["Empty addrman, adding seednode"], timeout=ADD_NEXT_SEEDNODE * 1.5):
44-
self.restart_node(0, extra_args=[f'-seednode={seed_node}'])
4548
node.setmocktime(int(time.time()) + ADD_NEXT_SEEDNODE + 1)
4649

4750
def run_test(self):
4851
self.test_no_seednode()
4952
self.test_seednode_empty_addrman()
50-
self.test_seednode_addrman_unreachable_peers()
53+
self.test_seednode_non_empty_addrman()
5154

5255

5356
if __name__ == '__main__':
5457
P2PSeedNodes(__file__).main()
55-

0 commit comments

Comments
 (0)