qa: Run all tests even if wallet is not compiled

2018-09-09 13:32:37 -04:00 · 2018-09-09 13:32:37 -04:00 · fac9539836
commit fac9539836
parent faa669cbcd
85 changed files with 378 additions and 72 deletions
--- a/test/functional/example_test.py
+++ b/test/functional/example_test.py
@ -67,10 +67,11 @@ def custom_function():
    # self.log.info("running custom_function")  # Oops! Can't run self.log outside the BitcoinTestFramework
    pass

+
 class ExampleTest(BitcoinTestFramework):
    # Each functional test is a subclass of the BitcoinTestFramework class.

-    # Override the set_test_params(), add_options(), setup_chain(), setup_network()
+    # Override the set_test_params(), skip_test_if_missing_module(), add_options(), setup_chain(), setup_network()
    # and setup_nodes() methods to customize the test setup as required.

    def set_test_params(self):
@ -84,6 +85,9 @@ class ExampleTest(BitcoinTestFramework):

        # self.log.info("I've finished set_test_params")  # Oops! Can't run self.log before run_test()

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    # Use add_options() to add specific command-line options for your test.
    # In practice this is not used very much, since the tests are mostly written
    # to be run in automated environments without command-line options.
--- a/test/functional/feature_bip68_sequence.py
+++ b/test/functional/feature_bip68_sequence.py
@ -25,6 +25,9 @@ class BIP68Test(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [[], ["-acceptnonstdtxn=0"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]

--- a/test/functional/feature_block.py
+++ b/test/functional/feature_block.py
@ -75,6 +75,9 @@ class FullBlockTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.extra_args = [[]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node = self.nodes[0]  # convenience reference to the node

--- a/test/functional/feature_blocksdir.py
+++ b/test/functional/feature_blocksdir.py
@ -16,6 +16,9 @@ class BlocksdirTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.stop_node(0)
        shutil.rmtree(self.nodes[0].datadir)
--- a/test/functional/feature_cltv.py
+++ b/test/functional/feature_cltv.py
@ -57,6 +57,9 @@ class BIP65Test(BitcoinTestFramework):
        self.extra_args = [['-whitelist=127.0.0.1']]
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.nodes[0].add_p2p_connection(P2PInterface())

--- a/test/functional/feature_config_args.py
+++ b/test/functional/feature_config_args.py
@ -14,6 +14,9 @@ class ConfArgsTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def test_config_file_parser(self):
        # Assume node is stopped

--- a/test/functional/feature_csv_activation.py
+++ b/test/functional/feature_csv_activation.py
@ -145,6 +145,9 @@ class BIP68_112_113Test(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=4', '-addresstype=legacy']]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def generate_blocks(self, number, version, test_blocks=None):
        if test_blocks is None:
            test_blocks = []
--- a/test/functional/feature_dbcrash.py
+++ b/test/functional/feature_dbcrash.py
@ -63,6 +63,9 @@ class ChainstateWriteCrashTest(BitcoinTestFramework):
        self.node3_args = ["-blockmaxweight=4000000"]
        self.extra_args = [self.node0_args, self.node1_args, self.node2_args, self.node3_args]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.add_nodes(self.num_nodes, extra_args=self.extra_args)
        self.start_nodes()
--- a/test/functional/feature_dersig.py
+++ b/test/functional/feature_dersig.py
@ -45,6 +45,9 @@ class BIP66Test(BitcoinTestFramework):
        self.extra_args = [['-whitelist=127.0.0.1']]
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.nodes[0].add_p2p_connection(P2PInterface())

--- a/test/functional/feature_fee_estimation.py
+++ b/test/functional/feature_fee_estimation.py
@ -126,6 +126,9 @@ class EstimateFeeTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 3

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        """
        We'll setup the network to have 3 nodes that all mine with different parameters.
--- a/test/functional/feature_logging.py
+++ b/test/functional/feature_logging.py
@ -15,6 +15,9 @@ class LoggingTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def relative_log_path(self, name):
        return os.path.join(self.nodes[0].datadir, "regtest", name)

--- a/test/functional/feature_maxuploadtarget.py
+++ b/test/functional/feature_maxuploadtarget.py
@ -40,6 +40,9 @@ class MaxUploadTest(BitcoinTestFramework):
        # Cache for utxos, as the listunspent may take a long time later in the test
        self.utxo_cache = []

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Before we connect anything, we first set the time on the node
        # to be in the past, otherwise things break because the CNode
--- a/test/functional/feature_minchainwork.py
+++ b/test/functional/feature_minchainwork.py
@ -31,6 +31,9 @@ class MinimumChainWorkTest(BitcoinTestFramework):
        self.extra_args = [[], ["-minimumchainwork=0x65"], ["-minimumchainwork=0x65"]]
        self.node_min_work = [0, 101, 101]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        # This test relies on the chain setup being:
        # node0 <- node1 <- node2
--- a/test/functional/feature_notifications.py
+++ b/test/functional/feature_notifications.py
@ -13,6 +13,9 @@ class NotificationsTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
        self.block_filename = os.path.join(self.options.tmpdir, "blocks.txt")
--- a/test/functional/feature_nulldummy.py
+++ b/test/functional/feature_nulldummy.py
@ -44,9 +44,12 @@ class NULLDUMMYTest(BitcoinTestFramework):
        # normal segwit activation here (and don't use the default always-on behaviour).
        self.extra_args = [['-whitelist=127.0.0.1', '-vbparams=segwit:0:999999999999', '-addresstype=legacy', "-deprecatedrpc=addwitnessaddress"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.address = self.nodes[0].getnewaddress()
-        self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address])['address']
+        self.ms_address = self.nodes[0].addmultisigaddress(1, [self.address])['address']
        self.wit_address = self.nodes[0].addwitnessaddress(self.address)
        self.wit_ms_address = self.nodes[0].addmultisigaddress(1, [self.address], '', 'p2sh-segwit')['address']

--- a/test/functional/feature_pruning.py
+++ b/test/functional/feature_pruning.py
@ -33,15 +33,20 @@ class PruneTest(BitcoinTestFramework):

        # Create nodes 0 and 1 to mine.
        # Create node 2 to test pruning.
-        self.full_node_default_args = ["-maxreceivebuffer=20000", "-checkblocks=5", "-limitdescendantcount=100", "-limitdescendantsize=5000", "-limitancestorcount=100", "-limitancestorsize=5000" ]
+        self.full_node_default_args = ["-maxreceivebuffer=20000", "-checkblocks=5", "-limitdescendantcount=100", "-limitdescendantsize=5000", "-limitancestorcount=100", "-limitancestorsize=5000"]
        # Create nodes 3 and 4 to test manual pruning (they will be re-started with manual pruning later)
        # Create nodes 5 to test wallet in prune mode, but do not connect
-        self.extra_args = [self.full_node_default_args,
-                           self.full_node_default_args,
-                           ["-maxreceivebuffer=20000", "-prune=550"],
-                           ["-maxreceivebuffer=20000"],
-                           ["-maxreceivebuffer=20000"],
-                           ["-prune=550"]]
+        self.extra_args = [
+            self.full_node_default_args,
+            self.full_node_default_args,
+            ["-maxreceivebuffer=20000", "-prune=550"],
+            ["-maxreceivebuffer=20000"],
+            ["-maxreceivebuffer=20000"],
+            ["-prune=550"],
+        ]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()

    def setup_network(self):
        self.setup_nodes()
--- a/test/functional/feature_rbf.py
+++ b/test/functional/feature_rbf.py
@ -61,17 +61,26 @@ def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):

    return COutPoint(int(txid, 16), 0)

-class ReplaceByFeeTest(BitcoinTestFramework):

+class ReplaceByFeeTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2
-        self.extra_args= [["-maxorphantx=1000",
-                           "-whitelist=127.0.0.1",
-                           "-limitancestorcount=50",
-                           "-limitancestorsize=101",
-                           "-limitdescendantcount=200",
-                           "-limitdescendantsize=101"],
-                           ["-mempoolreplacement=0"]]
+        self.extra_args = [
+            [
+                "-maxorphantx=1000",
+                "-whitelist=127.0.0.1",
+                "-limitancestorcount=50",
+                "-limitancestorsize=101",
+                "-limitdescendantcount=200",
+                "-limitdescendantsize=101",
+            ],
+            [
+                "-mempoolreplacement=0",
+            ],
+        ]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()

    def run_test(self):
        # Leave IBD
--- a/test/functional/feature_reindex.py
+++ b/test/functional/feature_reindex.py
@ -18,6 +18,9 @@ class ReindexTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def reindex(self, justchainstate=False):
        self.nodes[0].generate(3)
        blockcount = self.nodes[0].getblockcount()
--- a/test/functional/feature_segwit.py
+++ b/test/functional/feature_segwit.py
@ -46,9 +46,30 @@ class SegWitTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 3
        # This test tests SegWit both pre and post-activation, so use the normal BIP9 activation.
-        self.extra_args = [["-rpcserialversion=0", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"],
-                           ["-blockversion=4", "-rpcserialversion=1", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"],
-                           ["-blockversion=536870915", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]]
+        self.extra_args = [
+            [
+                "-rpcserialversion=0",
+                "-vbparams=segwit:0:999999999999",
+                "-addresstype=legacy",
+                "-deprecatedrpc=addwitnessaddress",
+            ],
+            [
+                "-blockversion=4",
+                "-rpcserialversion=1",
+                "-vbparams=segwit:0:999999999999",
+                "-addresstype=legacy",
+                "-deprecatedrpc=addwitnessaddress",
+            ],
+            [
+                "-blockversion=536870915",
+                "-vbparams=segwit:0:999999999999",
+                "-addresstype=legacy",
+                "-deprecatedrpc=addwitnessaddress",
+            ],
+        ]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()

    def setup_network(self):
        super().setup_network()
--- a/test/functional/feature_versionbits_warning.py
+++ b/test/functional/feature_versionbits_warning.py
@ -31,6 +31,9 @@ class VersionBitsWarningTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
        # Open and close to create zero-length file
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@ -12,6 +12,9 @@ class TestBitcoinCli(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        """Main test logic"""

--- a/test/functional/interface_rest.py
+++ b/test/functional/interface_rest.py
@ -43,6 +43,9 @@ class RESTTest (BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [["-rest"], []]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def test_rest_request(self, uri, http_method='GET', req_type=ReqType.JSON, body='', status=200, ret_type=RetType.JSON):
        rest_uri = '/rest' + uri
        if req_type == ReqType.JSON:
--- a/test/functional/interface_zmq.py
+++ b/test/functional/interface_zmq.py
@ -5,15 +5,16 @@
 """Test the ZMQ notification interface."""
 import struct

-from test_framework.test_framework import (
-    BitcoinTestFramework, skip_if_no_bitcoind_zmq, skip_if_no_py3_zmq)
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.messages import CTransaction
-from test_framework.util import (assert_equal,
-                                 bytes_to_hex_str,
-                                 hash256,
-                                )
+from test_framework.util import (
+    assert_equal,
+    bytes_to_hex_str,
+    hash256,
+)
 from io import BytesIO

+
 class ZMQSubscriber:
    def __init__(self, socket, topic):
        self.sequence = 0
@ -37,10 +38,12 @@ class ZMQTest (BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2

-    def setup_nodes(self):
-        skip_if_no_py3_zmq()
-        skip_if_no_bitcoind_zmq(self)
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_py3_zmq()
+        self.skip_if_no_bitcoind_zmq()
+        self.skip_if_no_wallet()

+    def setup_nodes(self):
        # Import keys
        self.add_nodes(self.num_nodes)
        self.start_nodes()
--- a/test/functional/mempool_accept.py
+++ b/test/functional/mempool_accept.py
@ -40,6 +40,9 @@ class MempoolAcceptanceTest(BitcoinTestFramework):
            '-acceptnonstdtxn=0',  # Try to mimic main-net
        ]] * self.num_nodes

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def check_mempool_result(self, result_expected, *args, **kwargs):
        """Wrapper to check result of testmempoolaccept on node_0's mempool"""
        result_test = self.nodes[0].testmempoolaccept(*args, **kwargs)
--- a/test/functional/mempool_limit.py
+++ b/test/functional/mempool_limit.py
@ -15,6 +15,9 @@ class MempoolLimitTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.extra_args = [["-maxmempool=5", "-spendzeroconfchange=0"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        txouts = gen_return_txouts()
        relayfee = self.nodes[0].getnetworkinfo()['relayfee']
--- a/test/functional/mempool_packages.py
+++ b/test/functional/mempool_packages.py
@ -18,6 +18,9 @@ class MempoolPackagesTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [["-maxorphantx=1000"], ["-maxorphantx=1000", "-limitancestorcount=5"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    # Build a transaction that spends parent_txid:vout
    # Return amount sent
    def chain_transaction(self, node, parent_txid, vout, value, fee, num_outputs):
--- a/test/functional/mempool_persist.py
+++ b/test/functional/mempool_persist.py
@ -47,6 +47,9 @@ class MempoolPersistTest(BitcoinTestFramework):
        self.num_nodes = 3
        self.extra_args = [[], ["-persistmempool=0"], []]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        chain_height = self.nodes[0].getblockcount()
        assert_equal(chain_height, 200)
--- a/test/functional/mempool_reorg.py
+++ b/test/functional/mempool_reorg.py
@ -17,6 +17,9 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    alert_filename = None  # Set by setup_network

    def run_test(self):
--- a/test/functional/mempool_resurrect.py
+++ b/test/functional/mempool_resurrect.py
@ -13,6 +13,9 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node0_address = self.nodes[0].getnewaddress()
        # Spend block 1/2/3's coinbase transactions
--- a/test/functional/mempool_spend_coinbase.py
+++ b/test/functional/mempool_spend_coinbase.py
@ -21,6 +21,9 @@ class MempoolSpendCoinbaseTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        chain_height = self.nodes[0].getblockcount()
        assert_equal(chain_height, 200)
--- a/test/functional/mining_basic.py
+++ b/test/functional/mining_basic.py
@ -38,6 +38,9 @@ class MiningTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.setup_clean_chain = False

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node = self.nodes[0]

--- a/test/functional/mining_getblocktemplate_longpoll.py
+++ b/test/functional/mining_getblocktemplate_longpoll.py
@ -28,6 +28,9 @@ class GetBlockTemplateLPTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.log.info("Warning: this test will take about 70 seconds in the best case. Be patient.")
        self.nodes[0].generate(10)
--- a/test/functional/mining_prioritisetransaction.py
+++ b/test/functional/mining_prioritisetransaction.py
@ -16,6 +16,9 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [["-printpriority=1"], ["-printpriority=1"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Test `prioritisetransaction` required parameters
        assert_raises_rpc_error(-1, "prioritisetransaction", self.nodes[0].prioritisetransaction)
--- a/test/functional/p2p_compactblocks.py
+++ b/test/functional/p2p_compactblocks.py
@ -102,6 +102,9 @@ class CompactBlocksTest(BitcoinTestFramework):
        self.extra_args = [["-vbparams=segwit:0:0"], ["-vbparams=segwit:0:999999999999", "-txindex", "-deprecatedrpc=addwitnessaddress"]]
        self.utxos = []

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def build_block_on_tip(self, node, segwit=False):
        height = node.getblockcount()
        tip = node.getbestblockhash()
--- a/test/functional/p2p_feefilter.py
+++ b/test/functional/p2p_feefilter.py
@ -42,6 +42,9 @@ class FeeFilterTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node1 = self.nodes[1]
        node0 = self.nodes[0]
--- a/test/functional/p2p_fingerprint.py
+++ b/test/functional/p2p_fingerprint.py
@ -30,6 +30,9 @@ class P2PFingerprintTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    # Build a chain of blocks on top of given one
    def build_chain(self, nblocks, prev_hash, prev_height, prev_median_time):
        blocks = []
--- a/test/functional/p2p_invalid_block.py
+++ b/test/functional/p2p_invalid_block.py
@ -24,6 +24,9 @@ class InvalidBlockRequestTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.extra_args = [["-whitelist=127.0.0.1"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Add p2p connection to node0
        node = self.nodes[0]  # convenience reference to the node
--- a/test/functional/p2p_invalid_locator.py
+++ b/test/functional/p2p_invalid_locator.py
@ -15,6 +15,9 @@ class InvalidLocatorTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.setup_clean_chain = False

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node = self.nodes[0]  # convenience reference to the node
        node.generate(1)  # Get node out of IBD
--- a/test/functional/p2p_invalid_tx.py
+++ b/test/functional/p2p_invalid_tx.py
@ -26,6 +26,9 @@ class InvalidTxRequestTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def bootstrap_p2p(self, *, num_connections=1):
        """Add a P2P connection to the node.

--- a/test/functional/p2p_leak.py
+++ b/test/functional/p2p_leak.py
@ -93,6 +93,9 @@ class P2PLeakTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.extra_args = [['-banscore=' + str(banscore)]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        no_version_bannode = self.nodes[0].add_p2p_connection(CNodeNoVersionBan(), send_version=False, wait_for_verack=False)
        no_version_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVersionIdle(), send_version=False, wait_for_verack=False)
--- a/test/functional/p2p_node_network_limited.py
+++ b/test/functional/p2p_node_network_limited.py
@ -34,6 +34,9 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
        self.num_nodes = 3
        self.extra_args = [['-prune=550', '-addrmantest'], [], []]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def disconnect_all(self):
        disconnect_nodes(self.nodes[0], 1)
        disconnect_nodes(self.nodes[1], 0)
--- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@ -198,6 +198,9 @@ class SegWitTest(BitcoinTestFramework):
        # This test tests SegWit both pre and post-activation, so use the normal BIP9 activation.
        self.extra_args = [["-whitelist=127.0.0.1", "-vbparams=segwit:0:999999999999"], ["-whitelist=127.0.0.1", "-acceptnonstdtxn=0", "-vbparams=segwit:0:999999999999"], ["-whitelist=127.0.0.1", "-vbparams=segwit:0:0"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()
        connect_nodes(self.nodes[0], 1)
--- a/test/functional/p2p_sendheaders.py
+++ b/test/functional/p2p_sendheaders.py
@ -208,6 +208,9 @@ class SendHeadersTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def mine_blocks(self, count):
        """Mine count blocks and return the new tip."""

--- a/test/functional/p2p_unrequested_blocks.py
+++ b/test/functional/p2p_unrequested_blocks.py
@ -66,6 +66,9 @@ class AcceptBlockTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [[], ["-minimumchainwork=0x10"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        # Node0 will be used to test behavior of processing unrequested blocks
        # from peers which are not whitelisted, while Node1 will be used for
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@ -48,6 +48,9 @@ class BlockchainTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.restart_node(0, extra_args=['-stopatheight=207', '-prune=1'])  # Set extra args with pruning after rescan is complete

--- a/test/functional/rpc_createmultisig.py
+++ b/test/functional/rpc_createmultisig.py
@ -12,8 +12,11 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 3

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def get_keys(self):
-        node0,node1,node2 = self.nodes
+        node0, node1, node2 = self.nodes
        self.add = [node1.getnewaddress() for _ in range(self.nkeys)]
        self.pub = [node1.getaddressinfo(a)["pubkey"] for a in self.add]
        self.priv = [node1.dumpprivkey(a) for a in self.add]
--- a/test/functional/rpc_fundrawtransaction.py
+++ b/test/functional/rpc_fundrawtransaction.py
@ -29,6 +29,9 @@ class RawTransactionsTest(BitcoinTestFramework):
        self.num_nodes = 4
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self, split=False):
        self.setup_nodes()

--- a/test/functional/rpc_getchaintips.py
+++ b/test/functional/rpc_getchaintips.py
@ -17,15 +17,18 @@ class GetChainTipsTest (BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 4

-    def run_test (self):
-        tips = self.nodes[0].getchaintips ()
-        assert_equal (len (tips), 1)
-        assert_equal (tips[0]['branchlen'], 0)
-        assert_equal (tips[0]['height'], 200)
-        assert_equal (tips[0]['status'], 'active')
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
+    def run_test(self):
+        tips = self.nodes[0].getchaintips()
+        assert_equal(len(tips), 1)
+        assert_equal(tips[0]['branchlen'], 0)
+        assert_equal(tips[0]['height'], 200)
+        assert_equal(tips[0]['status'], 'active')

        # Split the network and build two chains of different lengths.
-        self.split_network ()
+        self.split_network()
        self.nodes[0].generate(10)
        self.nodes[2].generate(20)
        self.sync_all([self.nodes[:2], self.nodes[2:]])
--- a/test/functional/rpc_help.py
+++ b/test/functional/rpc_help.py
@ -4,9 +4,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test RPC help output."""

-from test_framework.test_framework import BitcoinTestFramework, is_zmq_enabled
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, assert_raises_rpc_error

+
 class HelpRpcTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1
@ -26,12 +27,16 @@ class HelpRpcTest(BitcoinTestFramework):
        # command titles
        titles = [line[3:-3] for line in node.help().splitlines() if line.startswith('==')]

-        components = ['Blockchain', 'Control', 'Generating', 'Mining', 'Network', 'Rawtransactions', 'Util', 'Wallet']
+        components = ['Blockchain', 'Control', 'Generating', 'Mining', 'Network', 'Rawtransactions', 'Util']

-        if is_zmq_enabled(self):
+        if self.is_wallet_compiled():
+            components.append('Wallet')
+
+        if self.is_zmq_compiled():
            components.append('Zmq')

        assert_equal(titles, components)

+
 if __name__ == '__main__':
    HelpRpcTest().main()
--- a/test/functional/rpc_invalidateblock.py
+++ b/test/functional/rpc_invalidateblock.py
@ -14,6 +14,9 @@ class InvalidateTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 3

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()

--- a/test/functional/rpc_preciousblock.py
+++ b/test/functional/rpc_preciousblock.py
@ -38,6 +38,9 @@ class PreciousTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 3

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()

--- a/test/functional/rpc_psbt.py
+++ b/test/functional/rpc_psbt.py
@ -20,6 +20,9 @@ class PSBTTest(BitcoinTestFramework):
        self.setup_clean_chain = False
        self.num_nodes = 3

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Create and fund a raw tx for sending 10 BTC
        psbtx1 = self.nodes[0].walletcreatefundedpsbt([], {self.nodes[2].getnewaddress():10})['psbt']
--- a/test/functional/rpc_rawtransaction.py
+++ b/test/functional/rpc_rawtransaction.py
@ -44,6 +44,9 @@ class RawTransactionsTest(BitcoinTestFramework):
        self.num_nodes = 3
        self.extra_args = [["-addresstype=legacy"], ["-addresstype=legacy"], ["-addresstype=legacy"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self, split=False):
        super().setup_network()
        connect_nodes_bi(self.nodes, 0, 2)
--- a/test/functional/rpc_scantxoutset.py
+++ b/test/functional/rpc_scantxoutset.py
@ -14,6 +14,10 @@ class ScantxoutsetTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1
        self.setup_clean_chain = True
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.log.info("Mining blocks...")
        self.nodes[0].generate(110)
--- a/test/functional/rpc_signmessage.py
+++ b/test/functional/rpc_signmessage.py
@ -13,6 +13,9 @@ class SignMessagesTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.extra_args = [["-addresstype=legacy"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        message = 'This is just a test message'

--- a/test/functional/rpc_signrawtransaction.py
+++ b/test/functional/rpc_signrawtransaction.py
@ -14,6 +14,9 @@ class SignRawTransactionsTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.extra_args = [["-deprecatedrpc=signrawtransaction"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def successful_signing_test(self):
        """Create and sign a valid raw transaction with one input.

--- a/test/functional/rpc_txoutproof.py
+++ b/test/functional/rpc_txoutproof.py
@ -15,6 +15,9 @@ class MerkleBlockTest(BitcoinTestFramework):
        # Nodes 0/1 are "wallet" nodes, Nodes 2/3 are used for testing
        self.extra_args = [[], [], [], ["-txindex"]]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()
        connect_nodes(self.nodes[0], 1)
--- a/test/functional/rpc_zmq.py
+++ b/test/functional/rpc_zmq.py
@ -4,8 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test for the ZMQ RPC methods."""

-from test_framework.test_framework import (
-    BitcoinTestFramework, skip_if_no_py3_zmq, skip_if_no_bitcoind_zmq)
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal


@ -17,9 +16,11 @@ class RPCZMQTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_py3_zmq()
+        self.skip_if_no_bitcoind_zmq()
+
    def run_test(self):
-        skip_if_no_py3_zmq()
-        skip_if_no_bitcoind_zmq(self)
        self._test_getzmqnotifications()

    def _test_getzmqnotifications(self):
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@ -44,6 +44,13 @@ TEST_EXIT_FAILED = 1
 TEST_EXIT_SKIPPED = 77


+class SkipTest(Exception):
+    """This exception is raised to skip a test"""
+
+    def __init__(self, message):
+        self.message = message
+
+
 class BitcoinTestMetaClass(type):
    """Metaclass for BitcoinTestFramework.

@ -156,6 +163,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
        try:
            if self.options.usecli and not self.supports_cli:
                raise SkipTest("--usecli specified but test does not support using CLI")
+            self.skip_test_if_missing_module()
            self.setup_chain()
            self.setup_network()
            self.import_deterministic_coinbase_privkeys()
@ -221,6 +229,10 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
        """Override this method to add command-line options to the test"""
        pass

+    def skip_test_if_missing_module(self):
+        """Override this method to skip a test if a module is not compiled"""
+        pass
+
    def setup_chain(self):
        """Override this method to customize blockchain setup"""
        self.log.info("Initializing test directory " + self.options.tmpdir)
@ -486,30 +498,45 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
        for i in range(self.num_nodes):
            initialize_datadir(self.options.tmpdir, i)

+    def skip_if_no_py3_zmq(self):
+        """Attempt to import the zmq package and skip the test if the import fails."""
+        try:
+            import zmq  # noqa
+        except ImportError:
+            raise SkipTest("python3-zmq module not available.")

-class SkipTest(Exception):
-    """This exception is raised to skip a test"""
-    def __init__(self, message):
-        self.message = message
+    def skip_if_no_bitcoind_zmq(self):
+        """Skip the running test if bitcoind has not been compiled with zmq support."""
+        if not self.is_zmq_compiled():
+            raise SkipTest("bitcoind has not been built with zmq enabled.")

+    def skip_if_no_wallet(self):
+        """Skip the running test if wallet has not been compiled."""
+        if not self.is_wallet_compiled():
+            raise SkipTest("wallet has not been compiled.")

-def skip_if_no_py3_zmq():
-    """Attempt to import the zmq package and skip the test if the import fails."""
-    try:
-        import zmq  # noqa
-    except ImportError:
-        raise SkipTest("python3-zmq module not available.")
+    def skip_if_no_cli(self):
+        """Skip the running test if bitcoin-cli has not been compiled."""
+        if not self.is_cli_compiled():
+            raise SkipTest("bitcoin-cli has not been compiled.")

+    def is_cli_compiled(self):
+        """Checks whether bitcoin-cli was compiled."""
+        config = configparser.ConfigParser()
+        config.read_file(open(self.options.configfile))

-def skip_if_no_bitcoind_zmq(test_instance):
-    """Skip the running test if bitcoind has not been compiled with zmq support."""
-    if not is_zmq_enabled(test_instance):
-        raise SkipTest("bitcoind has not been built with zmq enabled.")
+        return config["components"].getboolean("ENABLE_UTILS")

+    def is_wallet_compiled(self):
+        """Checks whether the wallet module was compiled."""
+        config = configparser.ConfigParser()
+        config.read_file(open(self.options.configfile))

-def is_zmq_enabled(test_instance):
-    """Checks whether zmq is enabled or not."""
-    config = configparser.ConfigParser()
-    config.read_file(open(test_instance.options.configfile))
+        return config["components"].getboolean("ENABLE_WALLET")

-    return config["components"].getboolean("ENABLE_ZMQ")
+    def is_zmq_compiled(self):
+        """Checks whether the zmq module was compiled."""
+        config = configparser.ConfigParser()
+        config.read_file(open(self.options.configfile))
+
+        return config["components"].getboolean("ENABLE_ZMQ")
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@ -236,8 +236,6 @@ def main():

    logging.debug("Temporary test directory at %s" % tmpdir)

-    enable_wallet = config["components"].getboolean("ENABLE_WALLET")
-    enable_utils = config["components"].getboolean("ENABLE_UTILS")
    enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND")

    if config["environment"]["EXEEXT"] == ".exe" and not args.force:
@ -246,9 +244,9 @@ def main():
        print("Tests currently disabled on Windows by default. Use --force option to enable")
        sys.exit(0)

-    if not (enable_wallet and enable_utils and enable_bitcoind):
-        print("No functional tests to run. Wallet, utils, and bitcoind must all be enabled")
-        print("Rerun `configure` with -enable-wallet, -with-utils and -with-daemon and rerun make")
+    if not enable_bitcoind:
+        print("No functional tests to run.")
+        print("Rerun ./configure with --with-daemon and then make")
        sys.exit(0)

    # Build list of tests
--- a/test/functional/wallet_abandonconflict.py
+++ b/test/functional/wallet_abandonconflict.py
@ -20,6 +20,9 @@ class AbandonConflictTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [["-minrelaytxfee=0.00001"], []]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.nodes[1].generate(100)
        sync_blocks(self.nodes)
--- a/test/functional/wallet_address_types.py
+++ b/test/functional/wallet_address_types.py
@ -63,6 +63,7 @@ from test_framework.util import (
    sync_mempools,
 )

+
 class AddressTypeTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 6
@ -72,9 +73,12 @@ class AddressTypeTest(BitcoinTestFramework):
            ["-addresstype=p2sh-segwit", "-changetype=bech32"],
            ["-addresstype=bech32"],
            ["-changetype=p2sh-segwit"],
-            []
+            [],
        ]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()

--- a/test/functional/wallet_backup.py
+++ b/test/functional/wallet_backup.py
@ -45,6 +45,9 @@ class WalletBackupTest(BitcoinTestFramework):
        # nodes 1, 2,3 are spenders, let's give them a keypool=100
        self.extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self, split=False):
        self.setup_nodes()
        connect_nodes(self.nodes[0], 3)
--- a/test/functional/wallet_basic.py
+++ b/test/functional/wallet_basic.py
@ -23,6 +23,9 @@ class WalletTest(BitcoinTestFramework):
        self.num_nodes = 4
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.add_nodes(4)
        self.start_node(0)
--- a/test/functional/wallet_bumpfee.py
+++ b/test/functional/wallet_bumpfee.py
@ -31,8 +31,14 @@ class BumpFeeTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2
        self.setup_clean_chain = True
-        self.extra_args = [["-deprecatedrpc=addwitnessaddress", "-walletrbf={}".format(i), "-mintxfee=0.00002"]
-                           for i in range(self.num_nodes)]
+        self.extra_args = [[
+            "-deprecatedrpc=addwitnessaddress",
+            "-walletrbf={}".format(i),
+            "-mintxfee=0.00002",
+        ] for i in range(self.num_nodes)]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()

    def run_test(self):
        # Encrypt wallet for test_locked_wallet_fails test
--- a/test/functional/wallet_disableprivatekeys.py
+++ b/test/functional/wallet_disableprivatekeys.py
@ -17,6 +17,9 @@ class DisablePrivateKeysTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.supports_cli = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node = self.nodes[0]
        self.log.info("Test disableprivatekeys creation.")
--- a/test/functional/wallet_dump.py
+++ b/test/functional/wallet_dump.py
@ -87,6 +87,9 @@ class WalletDumpTest(BitcoinTestFramework):
        self.extra_args = [["-keypool=90", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]]
        self.rpc_timeout = 120

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self, split=False):
        self.add_nodes(self.num_nodes, extra_args=self.extra_args)
        self.start_nodes()
--- a/test/functional/wallet_encryption.py
+++ b/test/functional/wallet_encryption.py
@ -19,6 +19,9 @@ class WalletEncryptionTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        passphrase = "WalletPassphrase"
        passphrase2 = "SecondWalletPassphrase"
--- a/test/functional/wallet_fallbackfee.py
+++ b/test/functional/wallet_fallbackfee.py
@ -11,6 +11,9 @@ class WalletRBFTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.nodes[0].generate(101)

--- a/test/functional/wallet_groups.py
+++ b/test/functional/wallet_groups.py
@ -23,7 +23,10 @@ class WalletGroupTest(BitcoinTestFramework):
        self.extra_args = [[], [], ['-avoidpartialspends']]
        self.rpc_timewait = 120

-    def run_test (self):
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
+    def run_test(self):
        # Mine some coins
        self.nodes[0].generate(110)

--- a/test/functional/wallet_hd.py
+++ b/test/functional/wallet_hd.py
@ -21,6 +21,9 @@ class WalletHDTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [[], ['-keypool=0']]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Make sure can't switch off usehd after wallet creation
        self.stop_node(1)
--- a/test/functional/wallet_import_rescan.py
+++ b/test/functional/wallet_import_rescan.py
@ -109,6 +109,9 @@ class ImportRescanTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 2 + len(IMPORT_NODES)

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        extra_args = [["-addresstype=legacy"] for _ in range(self.num_nodes)]
        for i, import_node in enumerate(IMPORT_NODES, 2):
--- a/test/functional/wallet_importmulti.py
+++ b/test/functional/wallet_importmulti.py
@ -12,6 +12,9 @@ class ImportMultiTest (BitcoinTestFramework):
        self.extra_args = [["-addresstype=legacy"], ["-addresstype=legacy"]]
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def setup_network(self):
        self.setup_nodes()

--- a/test/functional/wallet_importprunedfunds.py
+++ b/test/functional/wallet_importprunedfunds.py
@ -16,6 +16,9 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.log.info("Mining blocks...")
        self.nodes[0].generate(101)
--- a/test/functional/wallet_keypool.py
+++ b/test/functional/wallet_keypool.py
@ -13,6 +13,9 @@ class KeyPoolTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        nodes = self.nodes
        addr_before_encrypting = nodes[0].getnewaddress()
--- a/test/functional/wallet_keypool_topup.py
+++ b/test/functional/wallet_keypool_topup.py
@ -27,6 +27,9 @@ class KeypoolRestoreTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.extra_args = [[], ['-keypool=100']]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
        wallet_backup_path = os.path.join(self.nodes[1].datadir, "wallet.bak")
--- a/test/functional/wallet_labels.py
+++ b/test/functional/wallet_labels.py
@ -19,6 +19,9 @@ class WalletLabelsTest(BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 1

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Check that there's no UTXO on the node
        node = self.nodes[0]
--- a/test/functional/wallet_listreceivedby.py
+++ b/test/functional/wallet_listreceivedby.py
@ -23,6 +23,9 @@ class ReceivedByTest(BitcoinTestFramework):
        super().import_deterministic_coinbase_privkeys()
        self.num_cb_reward_addresses = len(self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True, include_watchonly=True))

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Generate block to get out of IBD
        self.nodes[0].generate(1)
--- a/test/functional/wallet_listsinceblock.py
+++ b/test/functional/wallet_listsinceblock.py
@ -12,6 +12,9 @@ class ListSinceBlockTest (BitcoinTestFramework):
        self.num_nodes = 4
        self.setup_clean_chain = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.nodes[2].generate(101)
        self.sync_all()
--- a/test/functional/wallet_listtransactions.py
+++ b/test/functional/wallet_listtransactions.py
@ -27,6 +27,9 @@ class ListTransactionsTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.enable_mocktime()

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Simple send, 0 to 1:
        txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)
--- a/test/functional/wallet_multiwallet.py
+++ b/test/functional/wallet_multiwallet.py
@ -23,6 +23,9 @@ class MultiWalletTest(BitcoinTestFramework):
        self.num_nodes = 2
        self.supports_cli = True

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        node = self.nodes[0]

--- a/test/functional/wallet_resendwallettransactions.py
+++ b/test/functional/wallet_resendwallettransactions.py
@ -12,6 +12,9 @@ class ResendWalletTransactionsTest(BitcoinTestFramework):
        self.num_nodes = 1
        self.extra_args = [['--walletbroadcast=false']]

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        # Should raise RPC_WALLET_ERROR (-4) if walletbroadcast is disabled.
        assert_raises_rpc_error(-4, "Error: Wallet transaction broadcasting is disabled with -walletbroadcast", self.nodes[0].resendwallettransactions)
--- a/test/functional/wallet_txn_clone.py
+++ b/test/functional/wallet_txn_clone.py
@ -16,6 +16,9 @@ class TxnMallTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 4

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def add_options(self, parser):
        parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true",
                            help="Test double-spend of 1-confirmed transaction")
--- a/test/functional/wallet_txn_doublespend.py
+++ b/test/functional/wallet_txn_doublespend.py
@ -18,6 +18,9 @@ class TxnMallTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 4

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def add_options(self, parser):
        parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true",
                            help="Test double-spend of 1-confirmed transaction")
--- a/test/functional/wallet_zapwallettxes.py
+++ b/test/functional/wallet_zapwallettxes.py
@ -26,6 +26,9 @@ class ZapWalletTXesTest (BitcoinTestFramework):
        self.setup_clean_chain = True
        self.num_nodes = 2

+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
    def run_test(self):
        self.log.info("Mining blocks...")
        self.nodes[0].generate(1)