Skip to content

Commit 1c41fb9

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23812: test: fix intermittent failures in p2p_timeouts.py
0a1b6fa test: fix intermittent timeouts in p2p_timeouts.py (Martin Zumsande) Pull request description: Fixes #23800 by making sure that all peers are connected (i.e. `m_connected` is set) before the mocktime is bumped. We can't wait for verack here, but we can wait for a debug log entry ("Added connection peer=2") instead. In the failed CI runs (e.g. https://cirrus-ci.com/task/5600553806856192?logs=ci#L7469) different peers were added at different mocktimes. ACKs for top commit: naumenkogs: ACK 0a1b6fa theStack: Concept and approach ACK 0a1b6fa Tree-SHA512: 1a3c8a9a79339d4adc6ecb1731eb0d0eadb2e5024ad3c6779b4696691f85d6c3304ef8689746d0332150a4cf04489ca4b2ff3eeb0bb76feec28c1e4bb9dbca19
2 parents 70d6a09 + 0a1b6fa commit 1c41fb9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

test/functional/p2p_timeouts.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,13 @@ def run_test(self):
4848
self.mock_time = int(time.time())
4949
self.mock_forward(0)
5050

51-
# Setup the p2p connections
52-
no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn(), wait_for_verack=False)
53-
no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False)
54-
no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False)
51+
# Setup the p2p connections, making sure the connections are established before the mocktime is bumped
52+
with self.nodes[0].assert_debug_log(['Added connection peer=0']):
53+
no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn(), wait_for_verack=False)
54+
with self.nodes[0].assert_debug_log(['Added connection peer=1']):
55+
no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False)
56+
with self.nodes[0].assert_debug_log(['Added connection peer=2']):
57+
no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False)
5558

5659
# Wait until we got the verack in response to the version. Though, don't wait for the other node to receive the
5760
# verack, since we never sent one

0 commit comments

Comments
 (0)