aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/test_runner.py54
-rwxr-xr-xtest/functional/wallet_abandonconflict.py (renamed from test/functional/abandonconflict.py)0
-rwxr-xr-xtest/functional/wallet_accounts.py (renamed from test/functional/wallet-accounts.py)0
-rwxr-xr-xtest/functional/wallet_address_types.py (renamed from test/functional/address_types.py)0
-rwxr-xr-xtest/functional/wallet_backup.py (renamed from test/functional/walletbackup.py)0
-rwxr-xr-xtest/functional/wallet_basic.py (renamed from test/functional/wallet.py)0
-rwxr-xr-xtest/functional/wallet_bumpfee.py (renamed from test/functional/bumpfee.py)0
-rwxr-xr-xtest/functional/wallet_disable.py (renamed from test/functional/disablewallet.py)0
-rwxr-xr-xtest/functional/wallet_dump.py (renamed from test/functional/wallet-dump.py)0
-rwxr-xr-xtest/functional/wallet_encryption.py (renamed from test/functional/wallet-encryption.py)0
-rwxr-xr-xtest/functional/wallet_hd.py (renamed from test/functional/wallet-hd.py)0
-rwxr-xr-xtest/functional/wallet_import_rescan.py (renamed from test/functional/import-rescan.py)0
-rwxr-xr-xtest/functional/wallet_importmulti.py (renamed from test/functional/importmulti.py)0
-rwxr-xr-xtest/functional/wallet_importprunedfunds.py (renamed from test/functional/importprunedfunds.py)0
-rwxr-xr-xtest/functional/wallet_keypool.py (renamed from test/functional/keypool.py)0
-rwxr-xr-xtest/functional/wallet_keypool_topup.py (renamed from test/functional/keypool-topup.py)0
-rwxr-xr-xtest/functional/wallet_listreceivedby.py (renamed from test/functional/receivedby.py)0
-rwxr-xr-xtest/functional/wallet_listsinceblock.py (renamed from test/functional/listsinceblock.py)0
-rwxr-xr-xtest/functional/wallet_multiwallet.py (renamed from test/functional/multiwallet.py)0
-rwxr-xr-xtest/functional/wallet_resendwallettransactions.py (renamed from test/functional/resendwallettransactions.py)0
-rwxr-xr-xtest/functional/wallet_txn_clone.py (renamed from test/functional/txn_clone.py)0
-rwxr-xr-xtest/functional/wallet_txn_doublespend.py (renamed from test/functional/txn_doublespend.py)0
-rwxr-xr-xtest/functional/wallet_zapwallettxes.py (renamed from test/functional/zapwallettxes.py)0
23 files changed, 27 insertions, 27 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 6aad0f9b9d..edc1fed8cb 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
index 14964438af..14964438af 100755
--- a/test/functional/abandonconflict.py
+++ b/test/functional/wallet_abandonconflict.py
diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet_accounts.py
index ecd1cfc82b..ecd1cfc82b 100755
--- a/test/functional/wallet-accounts.py
+++ b/test/functional/wallet_accounts.py
diff --git a/test/functional/address_types.py b/test/functional/wallet_address_types.py
index 38a3425214..38a3425214 100755
--- a/test/functional/address_types.py
+++ b/test/functional/wallet_address_types.py
diff --git a/test/functional/walletbackup.py b/test/functional/wallet_backup.py
index b4be7debb5..b4be7debb5 100755
--- a/test/functional/walletbackup.py
+++ b/test/functional/wallet_backup.py
diff --git a/test/functional/wallet.py b/test/functional/wallet_basic.py
index a90dbc8adf..a90dbc8adf 100755
--- a/test/functional/wallet.py
+++ b/test/functional/wallet_basic.py
diff --git a/test/functional/bumpfee.py b/test/functional/wallet_bumpfee.py
index 2cd4127854..2cd4127854 100755
--- a/test/functional/bumpfee.py
+++ b/test/functional/wallet_bumpfee.py
diff --git a/test/functional/disablewallet.py b/test/functional/wallet_disable.py
index b0627d88ac..b0627d88ac 100755
--- a/test/functional/disablewallet.py
+++ b/test/functional/wallet_disable.py
diff --git a/test/functional/wallet-dump.py b/test/functional/wallet_dump.py
index 77f90ffb81..77f90ffb81 100755
--- a/test/functional/wallet-dump.py
+++ b/test/functional/wallet_dump.py
diff --git a/test/functional/wallet-encryption.py b/test/functional/wallet_encryption.py
index 3c927ee484..3c927ee484 100755
--- a/test/functional/wallet-encryption.py
+++ b/test/functional/wallet_encryption.py
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet_hd.py
index 9f0e9acb47..9f0e9acb47 100755
--- a/test/functional/wallet-hd.py
+++ b/test/functional/wallet_hd.py
diff --git a/test/functional/import-rescan.py b/test/functional/wallet_import_rescan.py
index d193a99d5b..d193a99d5b 100755
--- a/test/functional/import-rescan.py
+++ b/test/functional/wallet_import_rescan.py
diff --git a/test/functional/importmulti.py b/test/functional/wallet_importmulti.py
index be9be83839..be9be83839 100755
--- a/test/functional/importmulti.py
+++ b/test/functional/wallet_importmulti.py
diff --git a/test/functional/importprunedfunds.py b/test/functional/wallet_importprunedfunds.py
index 6b2919b5ae..6b2919b5ae 100755
--- a/test/functional/importprunedfunds.py
+++ b/test/functional/wallet_importprunedfunds.py
diff --git a/test/functional/keypool.py b/test/functional/wallet_keypool.py
index 45a5eed8ec..45a5eed8ec 100755
--- a/test/functional/keypool.py
+++ b/test/functional/wallet_keypool.py
diff --git a/test/functional/keypool-topup.py b/test/functional/wallet_keypool_topup.py
index e7af3c3987..e7af3c3987 100755
--- a/test/functional/keypool-topup.py
+++ b/test/functional/wallet_keypool_topup.py
diff --git a/test/functional/receivedby.py b/test/functional/wallet_listreceivedby.py
index 1f2b3c8aa7..1f2b3c8aa7 100755
--- a/test/functional/receivedby.py
+++ b/test/functional/wallet_listreceivedby.py
diff --git a/test/functional/listsinceblock.py b/test/functional/wallet_listsinceblock.py
index 67e7744bf8..67e7744bf8 100755
--- a/test/functional/listsinceblock.py
+++ b/test/functional/wallet_listsinceblock.py
diff --git a/test/functional/multiwallet.py b/test/functional/wallet_multiwallet.py
index b07e451667..b07e451667 100755
--- a/test/functional/multiwallet.py
+++ b/test/functional/wallet_multiwallet.py
diff --git a/test/functional/resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py
index d959bb4c38..d959bb4c38 100755
--- a/test/functional/resendwallettransactions.py
+++ b/test/functional/wallet_resendwallettransactions.py
diff --git a/test/functional/txn_clone.py b/test/functional/wallet_txn_clone.py
index ce26d6e0ee..ce26d6e0ee 100755
--- a/test/functional/txn_clone.py
+++ b/test/functional/wallet_txn_clone.py
diff --git a/test/functional/txn_doublespend.py b/test/functional/wallet_txn_doublespend.py
index 01129f3817..01129f3817 100755
--- a/test/functional/txn_doublespend.py
+++ b/test/functional/wallet_txn_doublespend.py
diff --git a/test/functional/zapwallettxes.py b/test/functional/wallet_zapwallettxes.py
index 08afb87894..08afb87894 100755
--- a/test/functional/zapwallettxes.py
+++ b/test/functional/wallet_zapwallettxes.py