aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorFabian Jahr <fjahr@protonmail.com>2022-05-13 00:51:48 +0200
committerFabian Jahr <fjahr@protonmail.com>2022-05-14 17:33:41 +0200
commit4faa5500724e3b1423ce1f927236b1ab1ac07943 (patch)
tree3a068d22955faa170939b90b24f92740cb7f982a /test
parent2709ffb9da42a89e8e03b6b2c594e4a5658d7dc2 (diff)
test: Fix race condition in index pruning test
Nodes are restarted and reconnected as part of the test. Afterwards `sync_blocks` is called immediately on the nodes. `sync_blocks` first checks that all the included nodes have at least one connection. Since adding a connection is usually happening in a thread, sometimes nodes could run into this check before the connection was fully established so that it would fail the entire test. This fix uses the `connect_nodes` helper to make the connection the nodes. `connect_nodes` has a wait for the connection built into it.
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/feature_index_prune.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/feature_index_prune.py b/test/functional/feature_index_prune.py
index 2bf57db923..3ee6a8036c 100755
--- a/test/functional/feature_index_prune.py
+++ b/test/functional/feature_index_prune.py
@@ -8,7 +8,6 @@ from test_framework.util import (
assert_equal,
assert_greater_than,
assert_raises_rpc_error,
- p2p_port,
)
@@ -132,11 +131,11 @@ class FeatureIndexPruneTest(BitcoinTestFramework):
self.nodes[i].assert_start_raises_init_error(extra_args=self.extra_args[i], expected_msg=msg)
self.log.info("make sure the nodes start again with the indices and an additional -reindex arg")
- ip_port = "127.0.0.1:" + str(p2p_port(3))
for i in range(3):
- # The nodes need to be reconnected to the non-pruning node upon restart, otherwise they will be stuck
- restart_args = self.extra_args[i]+["-reindex", f"-connect={ip_port}"]
+ restart_args = self.extra_args[i]+["-reindex"]
self.restart_node(i, extra_args=restart_args)
+ # The nodes need to be reconnected to the non-pruning node upon restart, otherwise they will be stuck
+ self.connect_nodes(i, 3)
self.sync_blocks(timeout=300)