From 90600bc7db2a8047c93bc10d403e862141ada770 Mon Sep 17 00:00:00 2001
From: Anthony Towns <aj@erisian.com.au>
Date: Thu, 25 Jan 2018 09:44:29 +1000
Subject: [PATCH] [tests] Rename wallet_* functional tests.

---
 test/functional/test_runner.py                | 54 +++++++++----------
 ...nconflict.py => wallet_abandonconflict.py} |  0
 ...{wallet-accounts.py => wallet_accounts.py} |  0
 ...dress_types.py => wallet_address_types.py} |  0
 .../{walletbackup.py => wallet_backup.py}     |  0
 .../functional/{wallet.py => wallet_basic.py} |  0
 .../{bumpfee.py => wallet_bumpfee.py}         |  0
 .../{disablewallet.py => wallet_disable.py}   |  0
 .../{wallet-dump.py => wallet_dump.py}        |  0
 ...let-encryption.py => wallet_encryption.py} |  0
 .../functional/{wallet-hd.py => wallet_hd.py} |  0
 ...port-rescan.py => wallet_import_rescan.py} |  0
 .../{importmulti.py => wallet_importmulti.py} |  0
 ...edfunds.py => wallet_importprunedfunds.py} |  0
 .../{keypool.py => wallet_keypool.py}         |  0
 ...ypool-topup.py => wallet_keypool_topup.py} |  0
 ...receivedby.py => wallet_listreceivedby.py} |  0
 ...sinceblock.py => wallet_listsinceblock.py} |  0
 .../{multiwallet.py => wallet_multiwallet.py} |  0
 ....py => wallet_resendwallettransactions.py} |  0
 .../{txn_clone.py => wallet_txn_clone.py}     |  0
 ...ublespend.py => wallet_txn_doublespend.py} |  0
 ...pwallettxes.py => wallet_zapwallettxes.py} |  0
 23 files changed, 27 insertions(+), 27 deletions(-)
 rename test/functional/{abandonconflict.py => wallet_abandonconflict.py} (100%)
 rename test/functional/{wallet-accounts.py => wallet_accounts.py} (100%)
 rename test/functional/{address_types.py => wallet_address_types.py} (100%)
 rename test/functional/{walletbackup.py => wallet_backup.py} (100%)
 rename test/functional/{wallet.py => wallet_basic.py} (100%)
 rename test/functional/{bumpfee.py => wallet_bumpfee.py} (100%)
 rename test/functional/{disablewallet.py => wallet_disable.py} (100%)
 rename test/functional/{wallet-dump.py => wallet_dump.py} (100%)
 rename test/functional/{wallet-encryption.py => wallet_encryption.py} (100%)
 rename test/functional/{wallet-hd.py => wallet_hd.py} (100%)
 rename test/functional/{import-rescan.py => wallet_import_rescan.py} (100%)
 rename test/functional/{importmulti.py => wallet_importmulti.py} (100%)
 rename test/functional/{importprunedfunds.py => wallet_importprunedfunds.py} (100%)
 rename test/functional/{keypool.py => wallet_keypool.py} (100%)
 rename test/functional/{keypool-topup.py => wallet_keypool_topup.py} (100%)
 rename test/functional/{receivedby.py => wallet_listreceivedby.py} (100%)
 rename test/functional/{listsinceblock.py => wallet_listsinceblock.py} (100%)
 rename test/functional/{multiwallet.py => wallet_multiwallet.py} (100%)
 rename test/functional/{resendwallettransactions.py => wallet_resendwallettransactions.py} (100%)
 rename test/functional/{txn_clone.py => wallet_txn_clone.py} (100%)
 rename test/functional/{txn_doublespend.py => wallet_txn_doublespend.py} (100%)
 rename test/functional/{zapwallettxes.py => wallet_zapwallettxes.py} (100%)

diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 6aad0f9b9..edc1fed8c 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -55,46 +55,46 @@ TEST_EXIT_SKIPPED = 77
 BASE_SCRIPTS= [
     # Scripts that are run by the travis build process.
     # Longest test should go first, to favor running tests in parallel
-    'wallet-hd.py',
-    'walletbackup.py',
+    'wallet_hd.py',
+    'wallet_backup.py',
     # vv Tests less than 5m vv
     'feature_block.py',
     'fundrawtransaction.py',
     'p2p-compactblocks.py',
     'feature_segwit.py',
     # vv Tests less than 2m vv
-    'wallet.py',
-    'wallet-accounts.py',
+    'wallet_basic.py',
+    'wallet_accounts.py',
     'p2p-segwit.py',
-    'wallet-dump.py',
+    'wallet_dump.py',
     'listtransactions.py',
     # vv Tests less than 60s vv
     'sendheaders.py',
-    'zapwallettxes.py',
-    'importmulti.py',
+    'wallet_zapwallettxes.py',
+    'wallet_importmulti.py',
     'mempool_limit.py',
     'merkle_blocks.py',
-    'receivedby.py',
-    'abandonconflict.py',
+    'wallet_listreceivedby.py',
+    'wallet_abandonconflict.py',
     'feature_csv_activation.py',
     'rawtransactions.py',
-    'address_types.py',
+    'wallet_address_types.py',
     'feature_reindex.py',
     # vv Tests less than 30s vv
-    'keypool-topup.py',
+    'wallet_keypool_topup.py',
     'zmq_test.py',
     'bitcoin_cli.py',
     'mempool_resurrect_test.py',
-    'txn_doublespend.py --mineblock',
-    'txn_clone.py',
-    'txn_clone.py --segwit',
+    'wallet_txn_doublespend.py --mineblock',
+    'wallet_txn_clone.py',
+    'wallet_txn_clone.py --segwit',
     'getchaintips.py',
     'rest.py',
     'mempool_spendcoinbase.py',
     'mempool_reorg.py',
     'mempool_persist.py',
-    'multiwallet.py',
-    'multiwallet.py --usecli',
+    'wallet_multiwallet.py',
+    'wallet_multiwallet.py --usecli',
     'httpbasics.py',
     'multi_rpc.py',
     'feature_proxy.py',
@@ -103,29 +103,29 @@ BASE_SCRIPTS= [
     'decodescript.py',
     'blockchain.py',
     'deprecated_rpc.py',
-    'disablewallet.py',
+    'wallet_disable.py',
     'net.py',
-    'keypool.py',
+    'wallet_keypool.py',
     'p2p-mempool.py',
     'prioritise_transaction.py',
     'invalidblockrequest.py',
     'invalidtxrequest.py',
     'feature_versionbits_warning.py',
     'preciousblock.py',
-    'importprunedfunds.py',
+    'wallet_importprunedfunds.py',
     'signmessages.py',
     'feature_nulldummy.py',
-    'import-rescan.py',
+    'wallet_import_rescan.py',
     'mining.py',
-    'bumpfee.py',
+    'wallet_bumpfee.py',
     'rpcnamedargs.py',
-    'listsinceblock.py',
+    'wallet_listsinceblock.py',
     'p2p-leaktests.py',
-    'wallet-encryption.py',
+    'wallet_encryption.py',
     'feature_dersig.py',
     'feature_cltv.py',
     'uptime.py',
-    'resendwallettransactions.py',
+    'wallet_resendwallettransactions.py',
     'feature_minchainwork.py',
     'p2p-fingerprint.py',
     'feature_uacomment.py',
@@ -158,8 +158,8 @@ EXTENDED_SCRIPTS = [
     # vv Tests less than 30s vv
     'feature_assumevalid.py',
     'example_test.py',
-    'txn_doublespend.py',
-    'txn_clone.py --mineblock',
+    'wallet_txn_doublespend.py',
+    'wallet_txn_clone.py --mineblock',
     'feature_notifications.py',
     'invalidateblock.py',
     'feature_rbf.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 = 60
+    EXPECTED_VIOLATION_COUNT = 37
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming
diff --git a/test/functional/abandonconflict.py b/test/functional/wallet_abandonconflict.py
similarity index 100%
rename from test/functional/abandonconflict.py
rename to test/functional/wallet_abandonconflict.py
diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet_accounts.py
similarity index 100%
rename from test/functional/wallet-accounts.py
rename to test/functional/wallet_accounts.py
diff --git a/test/functional/address_types.py b/test/functional/wallet_address_types.py
similarity index 100%
rename from test/functional/address_types.py
rename to test/functional/wallet_address_types.py
diff --git a/test/functional/walletbackup.py b/test/functional/wallet_backup.py
similarity index 100%
rename from test/functional/walletbackup.py
rename to test/functional/wallet_backup.py
diff --git a/test/functional/wallet.py b/test/functional/wallet_basic.py
similarity index 100%
rename from test/functional/wallet.py
rename to test/functional/wallet_basic.py
diff --git a/test/functional/bumpfee.py b/test/functional/wallet_bumpfee.py
similarity index 100%
rename from test/functional/bumpfee.py
rename to test/functional/wallet_bumpfee.py
diff --git a/test/functional/disablewallet.py b/test/functional/wallet_disable.py
similarity index 100%
rename from test/functional/disablewallet.py
rename to test/functional/wallet_disable.py
diff --git a/test/functional/wallet-dump.py b/test/functional/wallet_dump.py
similarity index 100%
rename from test/functional/wallet-dump.py
rename to test/functional/wallet_dump.py
diff --git a/test/functional/wallet-encryption.py b/test/functional/wallet_encryption.py
similarity index 100%
rename from test/functional/wallet-encryption.py
rename to test/functional/wallet_encryption.py
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet_hd.py
similarity index 100%
rename from test/functional/wallet-hd.py
rename to test/functional/wallet_hd.py
diff --git a/test/functional/import-rescan.py b/test/functional/wallet_import_rescan.py
similarity index 100%
rename from test/functional/import-rescan.py
rename to test/functional/wallet_import_rescan.py
diff --git a/test/functional/importmulti.py b/test/functional/wallet_importmulti.py
similarity index 100%
rename from test/functional/importmulti.py
rename to test/functional/wallet_importmulti.py
diff --git a/test/functional/importprunedfunds.py b/test/functional/wallet_importprunedfunds.py
similarity index 100%
rename from test/functional/importprunedfunds.py
rename to test/functional/wallet_importprunedfunds.py
diff --git a/test/functional/keypool.py b/test/functional/wallet_keypool.py
similarity index 100%
rename from test/functional/keypool.py
rename to test/functional/wallet_keypool.py
diff --git a/test/functional/keypool-topup.py b/test/functional/wallet_keypool_topup.py
similarity index 100%
rename from test/functional/keypool-topup.py
rename to test/functional/wallet_keypool_topup.py
diff --git a/test/functional/receivedby.py b/test/functional/wallet_listreceivedby.py
similarity index 100%
rename from test/functional/receivedby.py
rename to test/functional/wallet_listreceivedby.py
diff --git a/test/functional/listsinceblock.py b/test/functional/wallet_listsinceblock.py
similarity index 100%
rename from test/functional/listsinceblock.py
rename to test/functional/wallet_listsinceblock.py
diff --git a/test/functional/multiwallet.py b/test/functional/wallet_multiwallet.py
similarity index 100%
rename from test/functional/multiwallet.py
rename to test/functional/wallet_multiwallet.py
diff --git a/test/functional/resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py
similarity index 100%
rename from test/functional/resendwallettransactions.py
rename to test/functional/wallet_resendwallettransactions.py
diff --git a/test/functional/txn_clone.py b/test/functional/wallet_txn_clone.py
similarity index 100%
rename from test/functional/txn_clone.py
rename to test/functional/wallet_txn_clone.py
diff --git a/test/functional/txn_doublespend.py b/test/functional/wallet_txn_doublespend.py
similarity index 100%
rename from test/functional/txn_doublespend.py
rename to test/functional/wallet_txn_doublespend.py
diff --git a/test/functional/zapwallettxes.py b/test/functional/wallet_zapwallettxes.py
similarity index 100%
rename from test/functional/zapwallettxes.py
rename to test/functional/wallet_zapwallettxes.py