Merge #7190: backport: Merge bitcoin#29041

517c643 Merge bitcoin#29041: test: fix intermittent error in rpc_net.py (bitcoin#29030) (fanquake)

Pull request description:

  bitcoin backporting

ACKs for top commit:
  PastaPastaPasta:
    utACK 517c643

Tree-SHA512: 479da71df497e88940aa8ab18b3efa3be20f9fdfa8d0d64c0c5f02f2230a51bea43725f6617c6016d4392bea8635783006cda6d99b9bcd92cf1120835023775c

Author: PastaPastaPasta

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")