From 0a1b6fa5a18f3efb2ac3e28a23a4fd5e1cf9eaf0 Mon Sep 17 00:00:00 2001 From: Martin Zumsande Date: Sat, 18 Dec 2021 11:03:53 +0100 Subject: [PATCH] test: fix intermittent timeouts in p2p_timeouts.py by checking that all nodes are added before the mocktime is bumped. Fixes #23800 --- test/functional/p2p_timeouts.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index cf714bc888..48c9b1b56a 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -48,10 +48,13 @@ class TimeoutsTest(BitcoinTestFramework): self.mock_time = int(time.time()) self.mock_forward(0) - # Setup the p2p connections - no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn(), wait_for_verack=False) - no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) - no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) + # Setup the p2p connections, making sure the connections are established before the mocktime is bumped + with self.nodes[0].assert_debug_log(['Added connection peer=0']): + no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn(), wait_for_verack=False) + with self.nodes[0].assert_debug_log(['Added connection peer=1']): + no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) + with self.nodes[0].assert_debug_log(['Added connection peer=2']): + no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) # Wait until we got the verack in response to the version. Though, don't wait for the other node to receive the # verack, since we never sent one