Merge 32834034a3 into merged_master (Bitcoin PR bitcoin/bitcoin#26882)

This commit is contained in:
Byron Hambly 2025-04-02 09:47:37 +02:00
commit 1d7fb2b124
2 changed files with 13 additions and 1 deletions

View file

@ -860,6 +860,13 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
except ImportError:
raise SkipTest("python3-zmq module not available.")
def skip_if_no_py_sqlite3(self):
"""Attempt to import the sqlite3 package and skip the test if the import fails."""
try:
import sqlite3 # noqa
except ImportError:
raise SkipTest("sqlite3 module not available.")
def skip_if_no_python_bcc(self):
"""Attempt to import the bcc package and skip the tests if the import fails."""
try:

View file

@ -4,7 +4,11 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test descriptor wallet function."""
import os
import sqlite3
try:
import sqlite3
except ImportError:
pass
from test_framework.blocktools import COINBASE_MATURITY
from test_framework.test_framework import BitcoinTestFramework
@ -27,6 +31,7 @@ class WalletDescriptorTest(BitcoinTestFramework):
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_sqlite()
self.skip_if_no_py_sqlite3()
def run_test(self):
if self.is_bdb_compiled():