From 517c643c6fe147fb041a165f5c499afd4709de17 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 11 Dec 2023 10:56:00 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#29041: test: fix intermittent error in rpc_net.py (#29030) ea00f982d21aab51001d422225f00626a74db298 test: fix intermittent error in rpc_net.py (#29030) (Sebastian Falbesoner) Pull request description: Asserting for the debug log message "Added connection peer=" is insufficient for ensuring that this new connection will show up in a following getpeerinfo() call, as the debug message is written in the CNode ctor, which means it hasn't necessarily been added to CConnman.m_nodes at this point. Solve this by using the recently introduced `wait_for_new_peer` helper (see #29006, commit 00e0658e77f66103ebdeb29def99dc9f937c049d), which is more robust. Fixes #29030. ACKs for top commit: maflcko: lgtm ACK ea00f982d21aab51001d422225f00626a74db298 Tree-SHA512: dda307949a466fb3b24408a8c213d307e0af2155f2e8b4e52c836a22397f9d218bf9d8c54ca55bae62a96d7566f27167db9311dd8801785c327234783af5ed00 --- test/functional/rpc_net.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index bdc03248364d..7883df659fbb 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -119,7 +119,7 @@ def test_getpeerinfo(self): self.log.info("Check getpeerinfo output before a version message was sent") no_version_peer_id = 3 no_version_peer_conntime = self.mocktime - with self.nodes[0].assert_debug_log([f"Added connection peer={no_version_peer_id}"]): + with self.nodes[0].wait_for_new_peer(): no_version_peer = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False) if self.options.v2transport: self.wait_until(lambda: self.nodes[0].getpeerinfo()[no_version_peer_id]["transport_protocol_type"] == "v2")