From 81b79f2c394c08e2bcf612f89a230afb60074a81 Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Thu, 25 Jan 2018 09:44:29 +1000 Subject: [PATCH] [tests] Rename rpc_* functional tests. --- .../{rpcbind_test.py => rpc_bind.py} | 0 .../{blockchain.py => rpc_blockchain.py} | 0 .../{decodescript.py => rpc_decodescript.py} | 0 .../{deprecated_rpc.py => rpc_deprecated.py} | 0 ...ansaction.py => rpc_fundrawtransaction.py} | 0 .../{getchaintips.py => rpc_getchaintips.py} | 0 ...alidateblock.py => rpc_invalidateblock.py} | 0 ...ransactions.py => rpc_listtransactions.py} | 0 ...rpcnamedargs.py => rpc_named_arguments.py} | 0 test/functional/{net.py => rpc_net.py} | 0 ...{preciousblock.py => rpc_preciousblock.py} | 0 ...wtransactions.py => rpc_rawtransaction.py} | 0 .../{signmessages.py => rpc_signmessage.py} | 0 ...nsactions.py => rpc_signrawtransaction.py} | 0 .../{merkle_blocks.py => rpc_txoutproof.py} | 0 test/functional/{uptime.py => rpc_uptime.py} | 0 .../functional/{multi_rpc.py => rpc_users.py} | 0 test/functional/test_runner.py | 36 +++++++++---------- 18 files changed, 18 insertions(+), 18 deletions(-) rename test/functional/{rpcbind_test.py => rpc_bind.py} (100%) rename test/functional/{blockchain.py => rpc_blockchain.py} (100%) rename test/functional/{decodescript.py => rpc_decodescript.py} (100%) rename test/functional/{deprecated_rpc.py => rpc_deprecated.py} (100%) rename test/functional/{fundrawtransaction.py => rpc_fundrawtransaction.py} (100%) rename test/functional/{getchaintips.py => rpc_getchaintips.py} (100%) rename test/functional/{invalidateblock.py => rpc_invalidateblock.py} (100%) rename test/functional/{listtransactions.py => rpc_listtransactions.py} (100%) rename test/functional/{rpcnamedargs.py => rpc_named_arguments.py} (100%) rename test/functional/{net.py => rpc_net.py} (100%) rename test/functional/{preciousblock.py => rpc_preciousblock.py} (100%) rename test/functional/{rawtransactions.py => rpc_rawtransaction.py} (100%) rename test/functional/{signmessages.py => rpc_signmessage.py} (100%) rename test/functional/{signrawtransactions.py => rpc_signrawtransaction.py} (100%) rename test/functional/{merkle_blocks.py => rpc_txoutproof.py} (100%) rename test/functional/{uptime.py => rpc_uptime.py} (100%) rename test/functional/{multi_rpc.py => rpc_users.py} (100%) diff --git a/test/functional/rpcbind_test.py b/test/functional/rpc_bind.py similarity index 100% rename from test/functional/rpcbind_test.py rename to test/functional/rpc_bind.py diff --git a/test/functional/blockchain.py b/test/functional/rpc_blockchain.py similarity index 100% rename from test/functional/blockchain.py rename to test/functional/rpc_blockchain.py diff --git a/test/functional/decodescript.py b/test/functional/rpc_decodescript.py similarity index 100% rename from test/functional/decodescript.py rename to test/functional/rpc_decodescript.py diff --git a/test/functional/deprecated_rpc.py b/test/functional/rpc_deprecated.py similarity index 100% rename from test/functional/deprecated_rpc.py rename to test/functional/rpc_deprecated.py diff --git a/test/functional/fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py similarity index 100% rename from test/functional/fundrawtransaction.py rename to test/functional/rpc_fundrawtransaction.py diff --git a/test/functional/getchaintips.py b/test/functional/rpc_getchaintips.py similarity index 100% rename from test/functional/getchaintips.py rename to test/functional/rpc_getchaintips.py diff --git a/test/functional/invalidateblock.py b/test/functional/rpc_invalidateblock.py similarity index 100% rename from test/functional/invalidateblock.py rename to test/functional/rpc_invalidateblock.py diff --git a/test/functional/listtransactions.py b/test/functional/rpc_listtransactions.py similarity index 100% rename from test/functional/listtransactions.py rename to test/functional/rpc_listtransactions.py diff --git a/test/functional/rpcnamedargs.py b/test/functional/rpc_named_arguments.py similarity index 100% rename from test/functional/rpcnamedargs.py rename to test/functional/rpc_named_arguments.py diff --git a/test/functional/net.py b/test/functional/rpc_net.py similarity index 100% rename from test/functional/net.py rename to test/functional/rpc_net.py diff --git a/test/functional/preciousblock.py b/test/functional/rpc_preciousblock.py similarity index 100% rename from test/functional/preciousblock.py rename to test/functional/rpc_preciousblock.py diff --git a/test/functional/rawtransactions.py b/test/functional/rpc_rawtransaction.py similarity index 100% rename from test/functional/rawtransactions.py rename to test/functional/rpc_rawtransaction.py diff --git a/test/functional/signmessages.py b/test/functional/rpc_signmessage.py similarity index 100% rename from test/functional/signmessages.py rename to test/functional/rpc_signmessage.py diff --git a/test/functional/signrawtransactions.py b/test/functional/rpc_signrawtransaction.py similarity index 100% rename from test/functional/signrawtransactions.py rename to test/functional/rpc_signrawtransaction.py diff --git a/test/functional/merkle_blocks.py b/test/functional/rpc_txoutproof.py similarity index 100% rename from test/functional/merkle_blocks.py rename to test/functional/rpc_txoutproof.py diff --git a/test/functional/uptime.py b/test/functional/rpc_uptime.py similarity index 100% rename from test/functional/uptime.py rename to test/functional/rpc_uptime.py diff --git a/test/functional/multi_rpc.py b/test/functional/rpc_users.py similarity index 100% rename from test/functional/multi_rpc.py rename to test/functional/rpc_users.py diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 26beef5a52837..d93e0e018ea95 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -59,7 +59,7 @@ 'wallet_backup.py', # vv Tests less than 5m vv 'feature_block.py', - 'fundrawtransaction.py', + 'rpc_fundrawtransaction.py', 'p2p_compactblocks.py', 'feature_segwit.py', # vv Tests less than 2m vv @@ -67,17 +67,17 @@ 'wallet_accounts.py', 'p2p_segwit.py', 'wallet_dump.py', - 'listtransactions.py', + 'rpc_listtransactions.py', # vv Tests less than 60s vv 'p2p_sendheaders.py', 'wallet_zapwallettxes.py', 'wallet_importmulti.py', 'mempool_limit.py', - 'merkle_blocks.py', + 'rpc_txoutproof.py', 'wallet_listreceivedby.py', 'wallet_abandonconflict.py', 'feature_csv_activation.py', - 'rawtransactions.py', + 'rpc_rawtransaction.py', 'wallet_address_types.py', 'feature_reindex.py', # vv Tests less than 30s vv @@ -88,7 +88,7 @@ 'wallet_txn_doublespend.py --mineblock', 'wallet_txn_clone.py', 'wallet_txn_clone.py --segwit', - 'getchaintips.py', + 'rpc_getchaintips.py', 'rest.py', 'mempool_spendcoinbase.py', 'mempool_reorg.py', @@ -96,35 +96,35 @@ 'wallet_multiwallet.py', 'wallet_multiwallet.py --usecli', 'httpbasics.py', - 'multi_rpc.py', + 'rpc_users.py', 'feature_proxy.py', - 'signrawtransactions.py', + 'rpc_signrawtransaction.py', 'p2p_disconnect_ban.py', - 'decodescript.py', - 'blockchain.py', - 'deprecated_rpc.py', + 'rpc_decodescript.py', + 'rpc_blockchain.py', + 'rpc_deprecated.py', 'wallet_disable.py', - 'net.py', + 'rpc_net.py', 'wallet_keypool.py', 'p2p_mempool.py', 'prioritise_transaction.py', 'p2p_invalid_block.py', 'p2p_invalid_tx.py', 'feature_versionbits_warning.py', - 'preciousblock.py', + 'rpc_preciousblock.py', 'wallet_importprunedfunds.py', - 'signmessages.py', + 'rpc_signmessage.py', 'feature_nulldummy.py', 'wallet_import_rescan.py', 'mining.py', 'wallet_bumpfee.py', - 'rpcnamedargs.py', + 'rpc_named_arguments.py', 'wallet_listsinceblock.py', 'p2p_leak.py', 'wallet_encryption.py', 'feature_dersig.py', 'feature_cltv.py', - 'uptime.py', + 'rpc_uptime.py', 'wallet_resendwallettransactions.py', 'feature_minchainwork.py', 'p2p_fingerprint.py', @@ -154,14 +154,14 @@ # vv Tests less than 60s vv 'feature_bip9_softforks.py', 'p2p_feefilter.py', - 'rpcbind_test.py', + 'rpc_bind.py', # vv Tests less than 30s vv 'feature_assumevalid.py', 'example_test.py', 'wallet_txn_doublespend.py', 'wallet_txn_clone.py --mineblock', 'feature_notifications.py', - 'invalidateblock.py', + 'rpc_invalidateblock.py', 'feature_rbf.py', ] @@ -474,7 +474,7 @@ def was_successful(self): 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 = 24 + EXPECTED_VIOLATION_COUNT = 7 # LEEWAY is provided as a transition measure, so that pull-requests # that introduce new tests that don't conform with the naming