Skip to content

Commit

Permalink
Merge bitcoin#17675: tests: Enable tests which are incorrectly skippe…
Browse files Browse the repository at this point in the history
…d when running test_runner.py --usecli

5ac804a tests: Use a default of supports_cli=True (instead of supports_cli=False) (practicalswift)
993e38a tests: Mark functional tests not supporting bitcoin-cli (--usecli) as such (practicalswift)

Pull request description:

  Annotate functional tests supporting `bitcoin-cli` (`--usecli`) as such.

  Prior to this commit 74 tests were unnecessarily skipped when running `test_runner.py --usecli`.

  Before:

  ```
  $ test/functional/test_runner.py --usecli > /dev/null 2>&1
  $ echo $?
  0
  $ test/functional/test_runner.py --usecli 2>&1 | cut -f2 -d'|' | \
      grep -E ' (Passed|Skipped) *$' | sort | uniq -c
        9  ✓ Passed
      126  ○ Skipped
  ```

  After:

  ```
  $ test/functional/test_runner.py --usecli > /dev/null 2>&1
  $ echo $?
  0
  $ test/functional/test_runner.py --usecli 2>&1 | cut -f2 -d'|' | \
      grep -E ' (Passed|Skipped) *$' | sort | uniq -c
       83  ✓ Passed
       52  ○ Skipped
  ```

  Context: `--usecli` was introduced in bitcoin@f6ade9c

ACKs for top commit:
  laanwj:
    Code review ACK 5ac804a

Tree-SHA512: 249c0b691a74cf201c729df86c3db2b3faefa53b94703941e566943d252c6d14924e935a8da4f592951574235923fbb7cd22612a5e7e02ff6c762c55a2320ca3
  • Loading branch information
MarcoFalke authored and sidhujag committed Dec 9, 2019
1 parent 628ef9f commit fa95ca7
Show file tree
Hide file tree
Showing 55 changed files with 50 additions and 6 deletions.
1 change: 0 additions & 1 deletion test/functional/create_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class CreateCache(SyscoinTestFramework):

def set_test_params(self):
self.num_nodes = 0
self.supports_cli = True

def setup_network(self):
pass
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_config_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class ConfArgsTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.supports_cli = False

def test_config_file_parser(self):
# Assume node is stopped
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_csv_activation.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ def set_test_params(self):
self.num_nodes = 1
self.setup_clean_chain = True
self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=4', '-addresstype=legacy']]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_dbcrash.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def set_test_params(self):
self.num_nodes = 4
self.setup_clean_chain = False
self.rpc_timeout = 480
self.supports_cli = False

# Set -maxmempool=0 to turn off mempool memory sharing with dbcache
# Set -rpcservertimeout=900 to reduce socket disconnects in this
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_loadblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class LoadblockTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.supports_cli = False

def run_test(self):
self.nodes[1].setnetworkactive(state=False)
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_maxuploadtarget.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.extra_args = [["-maxuploadtarget=800", "-acceptnonstdtxn=1"]]
self.supports_cli = False

# Cache for utxos, as the listunspent may take a long time later in the test
self.utxo_cache = []
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_pruning.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class PruneTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 6
self.supports_cli = False

# Create nodes 0 and 1 to mine.
# Create node 2 to test pruning.
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_rbf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def set_test_params(self):
"-limitdescendantsize=101",
],
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_segwit.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def set_test_params(self):
"-addresstype=legacy",
],
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_shutdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class ShutdownTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.supports_cli = False

def run_test(self):
node = get_rpc_proxy(self.nodes[0].url, 1, timeout=600, coveragedir=self.nodes[0].coverage_dir)
Expand Down
1 change: 1 addition & 0 deletions test/functional/interface_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
class HTTPBasicsTest (SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 3
self.supports_cli = False

def setup_network(self):
self.setup_nodes()
Expand Down
1 change: 1 addition & 0 deletions test/functional/interface_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.extra_args = [["-rest"], []]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/interface_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class RPCInterfaceTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.setup_clean_chain = True
self.supports_cli = False

def test_getrpcinfo(self):
self.log.info("Testing getrpcinfo...")
Expand Down
1 change: 1 addition & 0 deletions test/functional/mempool_accept.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def set_test_params(self):
self.extra_args = [[
'-txindex',
]] * self.num_nodes
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/mempool_limit.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def set_test_params(self):
"-maxmempool=5",
"-spendzeroconfchange=0",
]]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/mempool_package_onemore.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class MempoolPackagesTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.extra_args = [["-maxorphantx=1000"]]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/mempool_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def set_test_params(self):
["-maxorphantx=1000"],
["-maxorphantx=1000", "-limitancestorcount={}".format(MAX_ANCESTORS_CUSTOM)],
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/mining_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class MiningTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.setup_clean_chain = True
self.supports_cli = False

def mine_chain(self):
self.log.info('Create some old blocks')
Expand Down
1 change: 1 addition & 0 deletions test/functional/mining_getblocktemplate_longpoll.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def run(self):
class GetBlockTemplateLPTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/mining_prioritisetransaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def set_test_params(self):
"-printpriority=1",
"-acceptnonstdtxn=1",
]] * self.num_nodes
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/p2p_disconnect_ban.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
class DisconnectBanTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.supports_cli = False

def run_test(self):
self.log.info("Connect nodes both way")
Expand Down
1 change: 1 addition & 0 deletions test/functional/p2p_segwit.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def set_test_params(self):
["-whitelist=127.0.0.1", "-acceptnonstdtxn=0", "-segwitheight={}".format(SEGWIT_HEIGHT)],
["-whitelist=127.0.0.1", "-acceptnonstdtxn=1", "-segwitheight=-1"]
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_bind.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def set_test_params(self):
self.setup_clean_chain = True
self.bind_to_localhost_only = False
self.num_nodes = 1
self.supports_cli = False

def setup_network(self):
self.add_nodes(self.num_nodes, None)
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class BlockchainTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.supports_cli = False

def run_test(self):
self.mine_chain()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_createmultisig.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class RpcCreateMultiSigTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 3
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 0 additions & 1 deletion test/functional/rpc_deriveaddresses.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
class DeriveaddressesTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.supports_cli = 1

def run_test(self):
assert_raises_rpc_error(-5, "Missing checksum", self.nodes[0].deriveaddresses, "a")
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_fundrawtransaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def set_test_params(self):
# This test isn't testing tx relay. Set whitelist on the peers for
# instant tx relay.
self.extra_args = [['-whitelist=127.0.0.1']] * self.num_nodes
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_getblockstats.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def add_options(self, parser):
def set_test_params(self):
self.num_nodes = 1
self.setup_clean_chain = True
self.supports_cli = False

def get_stats(self):
return [self.nodes[0].getblockstats(hash_or_height=self.start_height + i) for i in range(self.max_stat_pos+1)]
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
class HelpRpcTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.supports_cli = False

def run_test(self):
self.test_categories()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
class RpcMiscTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.supports_cli = False

def run_test(self):
node = self.nodes[0]
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_named_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
class NamedArgumentTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.supports_cli = False

def run_test(self):
node = self.nodes[0]
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_net.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.extra_args = [["-minrelaytxfee=0.00001000"],["-minrelaytxfee=0.00000500"]]
self.supports_cli = False

def run_test(self):
self.log.info('Connect nodes both way')
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_preciousblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class PreciousTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 3
self.supports_cli = False

def setup_network(self):
self.setup_nodes()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_psbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def set_test_params(self):
["-walletrbf=0"],
[]
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_rawtransaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def set_test_params(self):
["-txindex"],
["-txindex"],
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_signrawtransaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class SignRawTransactionsTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_txoutproof.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def set_test_params(self):
self.setup_clean_chain = True
# Nodes 0/1 are "wallet" nodes, Nodes 2/3 are used for testing
self.extra_args = [[], [], [], ["-txindex"]]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/rpc_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def call_with_auth(node, user, password):
class HTTPBasicsTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.supports_cli = False

def setup_chain(self):
super().setup_chain()
Expand Down
2 changes: 1 addition & 1 deletion test/functional/test_framework/test_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def __init__(self):
self.nodes = []
self.network_thread = None
self.rpc_timeout = 60 # Wait for up to 60 seconds for the RPC server to respond
self.supports_cli = False
self.supports_cli = True
self.bind_to_localhost_only = True
self.set_test_params()
self.parse_args()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_abandonconflict.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class AbandonConflictTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.extra_args = [["-minrelaytxfee=0.00001"], []]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_address_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def set_test_params(self):
# whitelist all peers to speed up tx relay / mempool sync
for args in self.extra_args:
args.append("-whitelist=127.0.0.1")
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def set_test_params(self):
['-limitdescendantcount=3'], # Limit mempool descendants as a hack to have wallet txs rejected from the mempool
[],
]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def set_test_params(self):
"-acceptnonstdtxn=1",
]] * self.num_nodes
self.setup_clean_chain = True
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_bumpfee.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def set_test_params(self):
"-deprecatedrpc=totalFee",
"-addresstype=bech32",
] for i in range(self.num_nodes)]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_bumpfee_totalfee_deprecation.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def set_test_params(self):
"-walletrbf={}".format(i),
"-mintxfee=0.00002",
] for i in range(self.num_nodes)]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 0 additions & 1 deletion test/functional/wallet_createwallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class CreateWalletTest(SyscoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = False
self.num_nodes = 1
self.supports_cli = True

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_hd.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 2
self.extra_args = [[], ['-keypool=0']]
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_implicitsegwit.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def check_implicit_transactions(implicit_keys, implicit_node):
class ImplicitSegwitTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_import_rescan.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ def get_rand_amount():
class ImportRescanTest(SyscoinTestFramework):
def set_test_params(self):
self.num_nodes = 2 + len(IMPORT_NODES)
self.supports_cli = False

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down
Loading

0 comments on commit fa95ca7

Please sign in to comment.