Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 21:42:32 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

test: Set wallet type in test_runner when only one type is allowed

Browse Source
This commit is contained in:
MarcoFalke 2022-11-29 14:26:46 +01:00
parent d415b7261c
commit fadb8696dd
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/test_framework/test_framework.py
View File

@ -448,11 +448,13 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
# Public helper methods. These can be accessed by the subclass test scripts. # Public helper methods. These can be accessed by the subclass test scripts.
def add_wallet_options(self, parser, *, descriptors=True, legacy=True): def add_wallet_options(self, parser, *, descriptors=True, legacy=True):
group = parser.add_mutually_exclusive_group()
kwargs = {} kwargs = {}
if descriptors + legacy == 1: if descriptors + legacy == 1:
# If only one type can be chosen, set it as default # If only one type can be chosen, set it as default
kwargs["default"] = descriptors kwargs["default"] = descriptors
group = parser.add_mutually_exclusive_group(
# If only one type is allowed, require it to be set in test_runner.py
required=os.getenv("REQUIRE_WALLET_TYPE_SET") == "1" and "default" in kwargs)
if descriptors: if descriptors:
group.add_argument("--descriptors", action='store_const', const=True, **kwargs, group.add_argument("--descriptors", action='store_const', const=True, **kwargs,
help="Run test using a descriptor wallet", dest='descriptors') help="Run test using a descriptor wallet", dest='descriptors')

12
test/functional/test_runner.py
View File

@ -27,6 +27,8 @@ import re
import logging import logging
import unittest import unittest
os.environ["REQUIRE_WALLET_TYPE_SET"] = "1"
# Formatting. Default colors to empty strings. # Formatting. Default colors to empty strings.
DEFAULT, BOLD, GREEN, RED = ("", ""), ("", ""), ("", ""), ("", "") DEFAULT, BOLD, GREEN, RED = ("", ""), ("", ""), ("", ""), ("", "")
try: try:
@ -159,7 +161,7 @@ BASE_SCRIPTS = [
'wallet_avoidreuse.py --descriptors', 'wallet_avoidreuse.py --descriptors',
'wallet_avoid_mixing_output_types.py --descriptors', 'wallet_avoid_mixing_output_types.py --descriptors',
'mempool_reorg.py', 'mempool_reorg.py',
'mempool_persist.py', 'mempool_persist.py --descriptors',
'p2p_block_sync.py', 'p2p_block_sync.py',
'wallet_multiwallet.py --legacy-wallet', 'wallet_multiwallet.py --legacy-wallet',
'wallet_multiwallet.py --descriptors', 'wallet_multiwallet.py --descriptors',
@ -208,7 +210,7 @@ BASE_SCRIPTS = [
'wallet_keypool.py --legacy-wallet', 'wallet_keypool.py --legacy-wallet',
'wallet_keypool.py --descriptors', 'wallet_keypool.py --descriptors',
'wallet_descriptor.py --descriptors', 'wallet_descriptor.py --descriptors',
'wallet_miniscript.py', 'wallet_miniscript.py --descriptors',
'feature_maxtipage.py', 'feature_maxtipage.py',
'p2p_nobloomfilter_messages.py', 'p2p_nobloomfilter_messages.py',
'p2p_filter.py', 'p2p_filter.py',
@ -222,7 +224,7 @@ BASE_SCRIPTS = [
'feature_assumevalid.py', 'feature_assumevalid.py',
'example_test.py', 'example_test.py',
'wallet_txn_doublespend.py --legacy-wallet', 'wallet_txn_doublespend.py --legacy-wallet',
'wallet_multisig_descriptor_psbt.py', 'wallet_multisig_descriptor_psbt.py --descriptors',
'wallet_txn_doublespend.py --descriptors', 'wallet_txn_doublespend.py --descriptors',
'feature_backwards_compatibility.py --legacy-wallet', 'feature_backwards_compatibility.py --legacy-wallet',
'feature_backwards_compatibility.py --descriptors', 'feature_backwards_compatibility.py --descriptors',
@ -294,8 +296,8 @@ BASE_SCRIPTS = [
'wallet_sendall.py --legacy-wallet', 'wallet_sendall.py --legacy-wallet',
'wallet_sendall.py --descriptors', 'wallet_sendall.py --descriptors',
'wallet_create_tx.py --descriptors', 'wallet_create_tx.py --descriptors',
'wallet_taproot.py', 'wallet_taproot.py --descriptors',
'wallet_inactive_hdchains.py', 'wallet_inactive_hdchains.py --legacy-wallet',
'p2p_fingerprint.py', 'p2p_fingerprint.py',
'feature_uacomment.py', 'feature_uacomment.py',
'feature_init.py', 'feature_init.py',