From 3150b3fea732df23c6273f43102cc64783aaee9c Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Thu, 25 Jan 2018 09:44:30 +1000 Subject: [PATCH] [tests] Rename misc functional tests. --- ...itcoin_cli.py => interface_bitcoin_cli.py} | 0 .../{httpbasics.py => interface_http.py} | 0 .../functional/{rest.py => interface_rest.py} | 0 .../{zmq_test.py => interface_zmq.py} | 0 ...resurrect_test.py => mempool_resurrect.py} | 0 ...dcoinbase.py => mempool_spend_coinbase.py} | 0 .../functional/{mining.py => mining_basic.py} | 0 ...py => mining_getblocktemplate_longpoll.py} | 0 ...ion.py => mining_prioritisetransaction.py} | 0 test/functional/test_runner.py | 20 +++++++++---------- 10 files changed, 10 insertions(+), 10 deletions(-) rename test/functional/{bitcoin_cli.py => interface_bitcoin_cli.py} (100%) rename test/functional/{httpbasics.py => interface_http.py} (100%) rename test/functional/{rest.py => interface_rest.py} (100%) rename test/functional/{zmq_test.py => interface_zmq.py} (100%) rename test/functional/{mempool_resurrect_test.py => mempool_resurrect.py} (100%) rename test/functional/{mempool_spendcoinbase.py => mempool_spend_coinbase.py} (100%) rename test/functional/{mining.py => mining_basic.py} (100%) rename test/functional/{getblocktemplate_longpoll.py => mining_getblocktemplate_longpoll.py} (100%) rename test/functional/{prioritise_transaction.py => mining_prioritisetransaction.py} (100%) diff --git a/test/functional/bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py similarity index 100% rename from test/functional/bitcoin_cli.py rename to test/functional/interface_bitcoin_cli.py diff --git a/test/functional/httpbasics.py b/test/functional/interface_http.py similarity index 100% rename from test/functional/httpbasics.py rename to test/functional/interface_http.py diff --git a/test/functional/rest.py b/test/functional/interface_rest.py similarity index 100% rename from test/functional/rest.py rename to test/functional/interface_rest.py diff --git a/test/functional/zmq_test.py b/test/functional/interface_zmq.py similarity index 100% rename from test/functional/zmq_test.py rename to test/functional/interface_zmq.py diff --git a/test/functional/mempool_resurrect_test.py b/test/functional/mempool_resurrect.py similarity index 100% rename from test/functional/mempool_resurrect_test.py rename to test/functional/mempool_resurrect.py diff --git a/test/functional/mempool_spendcoinbase.py b/test/functional/mempool_spend_coinbase.py similarity index 100% rename from test/functional/mempool_spendcoinbase.py rename to test/functional/mempool_spend_coinbase.py diff --git a/test/functional/mining.py b/test/functional/mining_basic.py similarity index 100% rename from test/functional/mining.py rename to test/functional/mining_basic.py diff --git a/test/functional/getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py similarity index 100% rename from test/functional/getblocktemplate_longpoll.py rename to test/functional/mining_getblocktemplate_longpoll.py diff --git a/test/functional/prioritise_transaction.py b/test/functional/mining_prioritisetransaction.py similarity index 100% rename from test/functional/prioritise_transaction.py rename to test/functional/mining_prioritisetransaction.py diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index d93e0e018..191540696 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -82,20 +82,20 @@ BASE_SCRIPTS= [ 'feature_reindex.py', # vv Tests less than 30s vv 'wallet_keypool_topup.py', - 'zmq_test.py', - 'bitcoin_cli.py', - 'mempool_resurrect_test.py', + 'interface_zmq.py', + 'interface_bitcoin_cli.py', + 'mempool_resurrect.py', 'wallet_txn_doublespend.py --mineblock', 'wallet_txn_clone.py', 'wallet_txn_clone.py --segwit', 'rpc_getchaintips.py', - 'rest.py', - 'mempool_spendcoinbase.py', + 'interface_rest.py', + 'mempool_spend_coinbase.py', 'mempool_reorg.py', 'mempool_persist.py', 'wallet_multiwallet.py', 'wallet_multiwallet.py --usecli', - 'httpbasics.py', + 'interface_http.py', 'rpc_users.py', 'feature_proxy.py', 'rpc_signrawtransaction.py', @@ -107,7 +107,7 @@ BASE_SCRIPTS= [ 'rpc_net.py', 'wallet_keypool.py', 'p2p_mempool.py', - 'prioritise_transaction.py', + 'mining_prioritisetransaction.py', 'p2p_invalid_block.py', 'p2p_invalid_tx.py', 'feature_versionbits_warning.py', @@ -116,7 +116,7 @@ BASE_SCRIPTS= [ 'rpc_signmessage.py', 'feature_nulldummy.py', 'wallet_import_rescan.py', - 'mining.py', + 'mining_basic.py', 'wallet_bumpfee.py', 'rpc_named_arguments.py', 'wallet_listsinceblock.py', @@ -149,7 +149,7 @@ EXTENDED_SCRIPTS = [ 'feature_dbcrash.py', # vv Tests less than 2m vv 'feature_bip68_sequence.py', - 'getblocktemplate_longpoll.py', + 'mining_getblocktemplate_longpoll.py', 'p2p_timeouts.py', # vv Tests less than 60s vv 'feature_bip9_softforks.py', @@ -474,7 +474,7 @@ class TestResult(): def check_script_prefixes(): """Check that no more than `EXPECTED_VIOLATION_COUNT` of the test scripts don't start with one of the allowed name prefixes.""" - EXPECTED_VIOLATION_COUNT = 7 + EXPECTED_VIOLATION_COUNT = 0 # LEEWAY is provided as a transition measure, so that pull-requests # that introduce new tests that don't conform with the naming