Skip to content

Commit dd1623a

Browse files
committed
Merge #539: Re-enable no wallet functional tests
adcc2d2 Re-enable no wallet functional tests (Gregory Sanders) Pull request description: We removed QT building which seemed to help, maybe we can reintroduce functional tests. Tree-SHA512: 8a31ad15ea876c5d33e799351fb46ee7be48f1e55695b0c42badb1bc5368cfbf2139039b6b048ab38a57e330c94776f5511c5e63d05be50e225019983a009757
2 parents 712fad0 + adcc2d2 commit dd1623a

16 files changed

+46
-1
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ jobs:
137137
DEP_OPTS="NO_WALLET=1 NO_QT=1"
138138
GOAL="install"
139139
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
140-
RUN_FUNCTIONAL_TESTS=false
141140
# Cross-Mac
142141
- stage: test
143142
env: >-

test/functional/feature_assetsdir.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ def set_test_params(self):
2222
self.num_nodes = 1
2323
[["-initialfreecoins=2100000000000000", "-anyonecanspendaremine=1", "-con_connect_coinbase=1", "-con_blocksubsidy=0"]]
2424

25+
def skip_test_if_missing_module(self):
26+
self.skip_if_no_wallet()
27+
2528
def setup_network(self, split=False):
2629
self.setup_nodes()
2730

test/functional/feature_block_subsidy.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def set_test_params(self):
2929
# 10 satoshi block subsidy at start for one node, none for other
3030
self.extra_args = [["-con_blocksubsidy=10"], ["-con_blocksubsidy=0", "-txindex=1"]]
3131

32+
def skip_test_if_missing_module(self):
33+
self.skip_if_no_wallet()
34+
3235
def run_test(self):
3336

3437
# Block will have 10 satoshi output, node 1 will ban

test/functional/feature_block_v4.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ def set_test_params(self):
1818
self.extra_args = [['-whitelist=127.0.0.1', '-con_bip34height=0', '-con_bip65height=0', '-con_bip66height=0', '-con_csv_deploy_start=-1']]
1919
self.setup_clean_chain = True
2020

21+
def skip_test_if_missing_module(self):
22+
self.skip_if_no_wallet()
23+
2124
def run_test(self):
2225

2326
# First, quick check that CSV is ACTIVE at genesis

test/functional/feature_blocksign.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ class BlockSignTest(BitcoinTestFramework):
4646
As well as syncing blocks over p2p
4747
4848
"""
49+
50+
def skip_test_if_missing_module(self):
51+
self.skip_if_no_wallet()
52+
4953
# Dynamically generate N keys to be used for block signing.
5054
def init_keys(self, num_keys):
5155
self.keys = []

test/functional/feature_confidential_transactions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ def setup_network(self, split=False):
2525
self.is_network_split = False
2626
self.sync_all()
2727

28+
def skip_test_if_missing_module(self):
29+
self.skip_if_no_wallet()
30+
2831
def run_test(self):
2932

3033
print("General Confidential tests")

test/functional/feature_connect_coinbase.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ def set_test_params(self):
1919
self.extra_args = [["-con_connect_coinbase=0", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN)],
2020
["-con_connect_coinbase=1", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN), '-anyonecanspendaremine=1']]
2121

22+
def skip_test_if_missing_module(self):
23+
self.skip_if_no_wallet()
24+
2225
def run_test(self):
2326
# Same genesis block
2427
assert_equal(self.nodes[0].getblockhash(0), self.nodes[1].getblockhash(0))

test/functional/feature_default_asset_name.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def setup_network(self, split=False):
2929
self.is_network_split = False
3030
self.sync_all()
3131

32+
def skip_test_if_missing_module(self):
33+
self.skip_if_no_wallet()
34+
3235
def run_test(self):
3336
#Claim all anyone-can-spend coins and test that calling sendtoaddress without providing the assetlabel parameter results in the specified default pegged asset being sent.
3437
self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 21000000, "", "", True)

test/functional/feature_fedpeg.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ def add_options(self, parser):
3232
parser.add_argument("--parent_bitcoin", dest="parent_bitcoin", default=False, action="store_true",
3333
help="Parent nodes are Bitcoin")
3434

35+
def skip_test_if_missing_module(self):
36+
self.skip_if_no_wallet()
37+
3538
def setup_network(self, split=False):
3639
if self.options.parent_bitcoin and self.options.parent_binpath == "":
3740
raise Exception("Can't run with --parent_bitcoin without specifying --parent_binpath")

test/functional/feature_initial_reissuance_token.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ def set_test_params(self):
2323
#Set number of initial reissuance tokens and also set initial free coins less than max so we can reissue more later
2424
self.extra_args = [["-initialreissuancetokens=200000000", "-initialfreecoins=2000000000000000", "-anyonecanspendaremine=1", "-con_connect_coinbase=1", "-con_blocksubsidy=0", "-blindedaddresses=1"]]*2
2525

26+
def skip_test_if_missing_module(self):
27+
self.skip_if_no_wallet()
28+
2629
def setup_network(self, split=False):
2730
self.setup_nodes()
2831
connect_nodes_bi(self.nodes, 0, 1)

0 commit comments

Comments
 (0)