Skip to content

Commit 3641597

Browse files
committed
tests: Don't make any wallets unless wallet is required
1 parent b9b88f5 commit 3641597

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

test/functional/test_framework/test_framework.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ def __init__(self):
110110
# skipped. If list is truncated, wallet creation is skipped and keys
111111
# are not imported.
112112
self.wallet_names = None
113+
# By default the wallet is not required. Set to true by skip_if_no_wallet().
114+
# When False, we ignore wallet_names regardless of what it is.
115+
self.requires_wallet = False
113116
self.set_test_params()
114117
assert self.wallet_names is None or len(self.wallet_names) <= self.num_nodes
115118
if self.options.timeout_factor == 0 :
@@ -393,7 +396,7 @@ def setup_nodes(self):
393396
extra_args = self.extra_args
394397
self.add_nodes(self.num_nodes, extra_args)
395398
self.start_nodes()
396-
if self.is_wallet_compiled():
399+
if self.requires_wallet:
397400
self.import_deterministic_coinbase_privkeys()
398401
if not self.setup_clean_chain:
399402
for n in self.nodes:
@@ -785,6 +788,7 @@ def skip_if_no_bitcoind_zmq(self):
785788

786789
def skip_if_no_wallet(self):
787790
"""Skip the running test if wallet has not been compiled."""
791+
self.requires_wallet = True
788792
if not self.is_wallet_compiled():
789793
raise SkipTest("wallet has not been compiled.")
790794
if self.options.descriptors:

0 commit comments

Comments
 (0)