diff --git a/test/functional/rpc_setban.py b/test/functional/rpc_setban.py index 36873f964b..c3ba6bc9b4 100755 --- a/test/functional/rpc_setban.py +++ b/test/functional/rpc_setban.py @@ -4,6 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the setban rpc call.""" +from contextlib import ExitStack from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( p2p_port @@ -28,7 +29,13 @@ class SetBanTests(BitcoinTestFramework): self.nodes[1].setban("127.0.0.1", "add") # Node 0 should not be able to reconnect - with self.nodes[1].assert_debug_log(expected_msgs=['dropped (banned)\n'], timeout=50): + context = ExitStack() + context.enter_context(self.nodes[1].assert_debug_log(expected_msgs=['dropped (banned)\n'], timeout=50)) + # When disconnected right after connecting, a v2 node will attempt to reconnect with v1. + # Wait for that to happen so that it cannot mess with later tests. + if self.options.v2transport: + context.enter_context(self.nodes[0].assert_debug_log(expected_msgs=['trying v1 connection'], timeout=50)) + with context: self.restart_node(1, []) self.nodes[0].addnode("127.0.0.1:" + str(p2p_port(1)), "onetry") diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index c7303237f4..4c88adc025 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -235,6 +235,7 @@ BASE_SCRIPTS = [ 'p2p_filter.py', 'p2p_blocksonly.py', 'rpc_setban.py', + 'rpc_setban.py --v2transport', 'mining_prioritisetransaction.py', 'p2p_invalid_locator.py', 'p2p_invalid_block.py',