Skip to content

Commit

Permalink
Merge #539: Re-enable no wallet functional tests
Browse files Browse the repository at this point in the history
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
  • Loading branch information
stevenroose committed Mar 27, 2019
2 parents 712fad0 + adcc2d2 commit dd1623a
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 1 deletion.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ jobs:
DEP_OPTS="NO_WALLET=1 NO_QT=1"
GOAL="install"
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
RUN_FUNCTIONAL_TESTS=false
# Cross-Mac
- stage: test
env: >-
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_assetsdir.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ def set_test_params(self):
self.num_nodes = 1
[["-initialfreecoins=2100000000000000", "-anyonecanspendaremine=1", "-con_connect_coinbase=1", "-con_blocksubsidy=0"]]

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

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

Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_block_subsidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def set_test_params(self):
# 10 satoshi block subsidy at start for one node, none for other
self.extra_args = [["-con_blocksubsidy=10"], ["-con_blocksubsidy=0", "-txindex=1"]]

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):

# Block will have 10 satoshi output, node 1 will ban
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_block_v4.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ def set_test_params(self):
self.extra_args = [['-whitelist=127.0.0.1', '-con_bip34height=0', '-con_bip65height=0', '-con_bip66height=0', '-con_csv_deploy_start=-1']]
self.setup_clean_chain = True

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):

# First, quick check that CSV is ACTIVE at genesis
Expand Down
4 changes: 4 additions & 0 deletions test/functional/feature_blocksign.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ class BlockSignTest(BitcoinTestFramework):
As well as syncing blocks over p2p
"""

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

# Dynamically generate N keys to be used for block signing.
def init_keys(self, num_keys):
self.keys = []
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_confidential_transactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ def setup_network(self, split=False):
self.is_network_split = False
self.sync_all()

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):

print("General Confidential tests")
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_connect_coinbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ def set_test_params(self):
self.extra_args = [["-con_connect_coinbase=0", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN)],
["-con_connect_coinbase=1", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN), '-anyonecanspendaremine=1']]

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
# Same genesis block
assert_equal(self.nodes[0].getblockhash(0), self.nodes[1].getblockhash(0))
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_default_asset_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def setup_network(self, split=False):
self.is_network_split = False
self.sync_all()

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
#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.
self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 21000000, "", "", True)
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_fedpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ def add_options(self, parser):
parser.add_argument("--parent_bitcoin", dest="parent_bitcoin", default=False, action="store_true",
help="Parent nodes are Bitcoin")

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def setup_network(self, split=False):
if self.options.parent_bitcoin and self.options.parent_binpath == "":
raise Exception("Can't run with --parent_bitcoin without specifying --parent_binpath")
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_initial_reissuance_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def set_test_params(self):
#Set number of initial reissuance tokens and also set initial free coins less than max so we can reissue more later
self.extra_args = [["-initialreissuancetokens=200000000", "-initialfreecoins=2000000000000000", "-anyonecanspendaremine=1", "-con_connect_coinbase=1", "-con_blocksubsidy=0", "-blindedaddresses=1"]]*2

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def setup_network(self, split=False):
self.setup_nodes()
connect_nodes_bi(self.nodes, 0, 1)
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_issuance.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ def set_test_params(self):
self.extra_args = [["-blindedaddresses=1"]] * self.num_nodes
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()
connect_nodes_bi(self.nodes, 0, 1)
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_mandatory_coinbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ def set_test_params(self):
# Non-zero coinbase outputs *must* match this. Not setting it means anything is allowed
self.extra_args = [["-con_mandatorycoinbase="+mandatory_script], []]

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
node0 = self.nodes[0]
node1 = self.nodes[1]
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_pak.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ def set_test_params(self):
self.extra_args[i_pak1] = self.extra_args[i_pak1] + pak_to_option(pak1)
self.extra_args[i_pak2] = self.extra_args[i_pak2] + pak_to_option(pak2)

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):

# Give novalidate 50 BTC
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_progress.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def set_test_params(self):
self.num_nodes = 2
self.extra_args = [["-debug", "-con_npowtargetspacing=1", "-maxtimeadjustment=0"]] * self.num_nodes

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def setup_network(self):
self.setup_nodes()
self.is_network_split = True
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_txwitness.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def assert_tx_format_also_signed(self, utxo, segwit):
raw = self.nodes[0].createrawtransaction(
[{"txid": utxo["txid"], "vout": utxo["vout"]}],
Expand Down
3 changes: 3 additions & 0 deletions test/functional/rpc_tweakfedpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ def set_test_params(self):
def setup_network(self):
self.setup_nodes()

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
# Test that OP_TRUE mainchain_addr/claim_script never changes
assert_equal(self.nodes[0].getsidechaininfo()["fedpegscript"], OP_TRUE_SCRIPT)
Expand Down

0 comments on commit dd1623a

Please sign in to comment.