From fa310cc6f499e3e3dd58dc382e04e9db3f02bc3b Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 18 Mar 2025 17:32:21 +0100 Subject: [PATCH] test: Fix intermittent issue in p2p_orphan_handling.py --- test/functional/p2p_orphan_handling.py | 1 + test/functional/test_framework/test_node.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/p2p_orphan_handling.py b/test/functional/p2p_orphan_handling.py index ac8b6fd7056..e839b2d987c 100755 --- a/test/functional/p2p_orphan_handling.py +++ b/test/functional/p2p_orphan_handling.py @@ -789,6 +789,7 @@ class OrphanHandlingTest(BitcoinTestFramework): # Disconnect peer1. peer2 should become the new candidate for orphan resolution. peer1.peer_disconnect() self.wait_until(lambda: node.num_test_p2p_connections() == 1) + peer2.sync_with_ping() # Sync with the 'net' thread which completes the disconnection fully node.bumpmocktime(TXREQUEST_TIME_SKIP) self.wait_until(lambda: len(node.getorphantxs(verbosity=2)[0]["from"]) == 1) # Both parents should be requested, now that they are both missing. diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 52efadb6e22..db83c99c13f 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -827,7 +827,8 @@ class TestNode(): def disconnect_p2ps(self): """Close all p2p connections to the node. - Use only after each p2p has sent a version message to ensure the wait works.""" + The state of the peers (such as txrequests) may not be fully cleared + yet, even after this method returns.""" for p in self.p2ps: p.peer_disconnect() del self.p2ps[:]