Reorder RPC tests for running time

qa/pull-tester/rpc-tests.py

@@ -100,31 +100,48 @@ if ENABLE_ZMQ:
 
 testScripts = [
     # longest test should go first, to favor running tests in parallel
-    'p2p-fullblocktest.py',
-    'walletbackup.py',
-    'paymentdisclosure.py',
-    'prioritisetransaction.py',
-    'wallet_treestate.py',
-    'wallet_anchorfork.py',
-    'wallet_changeaddresses.py',
-    'wallet_changeindicator.py',
-    'wallet_import_export.py',
-    'wallet_sendmany_any_taddr.py',
-    'wallet_shieldingcoinbase.py',
-    'wallet_shieldcoinbase_sprout.py',
-    'wallet_shieldcoinbase_sapling.py',
-    'wallet_listreceived.py',
+    # vv Tests less than 5m vv
+    'mergetoaddress_sapling.py',
     'wallet.py',
+    'wallet_shieldcoinbase_sprout.py',
+    'sprout_sapling_migration.py',
+    'remove_sprout_shielding.py',
+    'zcjoinsplitdoublespend.py',
+    # vv Tests less than 2m vv
+    'zcjoinsplit.py',
+    'mergetoaddress_mixednotes.py',
+    'wallet_shieldcoinbase_sapling.py',
+    'turnstile.py',
+    'walletbackup.py',
+    'zkey_import_export.py',
+    'prioritisetransaction.py',
+    'wallet_changeaddresses.py',
+    'wallet_listreceived.py',
+    'mempool_tx_expiry.py',
+    'finalsaplingroot.py',
     'wallet_overwintertx.py',
     'wallet_persistence.py',
-    'wallet_nullifiers.py',
+    'wallet_listnotes.py',
+    # v-- This test is down here to spread the CPU load.
+    'mergetoaddress_sprout.py',
+    # vv Tests less than 60s vv
+    'fundrawtransaction.py',
+    'reorg_limit.py',
+    'mempool_limit.py',
+    'p2p-fullblocktest.py',
+    'paymentdisclosure.py',
+    # vv Tests less than 30s vv
     'wallet_1941.py',
     'wallet_addresses.py',
+    'wallet_anchorfork.py',
+    'wallet_changeindicator.py',
+    'wallet_import_export.py',
+    'wallet_nullifiers.py',
     'wallet_sapling.py',
-    'wallet_listnotes.py',
-    'mergetoaddress_sprout.py',
-    'mergetoaddress_sapling.py',
-    'mergetoaddress_mixednotes.py',
+    'wallet_sendmany_any_taddr.py',
+    # v-- This test is down here to spread the CPU load.
+    'wallet_shieldingcoinbase.py',
+    'wallet_treestate.py',
     'listtransactions.py',
     'mempool_resurrect_test.py',
     'txn_doublespend.py',
@@ -133,17 +150,14 @@ testScripts = [
     'rawtransactions.py',
     'getrawtransaction_insight.py',
     'rest.py',
-    'mempool_limit.py',
     'mempool_spendcoinbase.py',
     'mempool_reorg.py',
     'mempool_nu_activation.py',
-    'mempool_tx_expiry.py',
     'httpbasics.py',
     'multi_rpc.py',
     'zapwallettxes.py',
     'proxy_test.py',
     'merkle_blocks.py',
-    'fundrawtransaction.py',
     'signrawtransactions.py',
     'signrawtransaction_offline.py',
     'key_import_export.py',
@@ -156,10 +170,6 @@ testScripts = [
     'blockchain.py',
     'disablewallet.py',
     'keypool.py',
-    'zcjoinsplit.py',
-    'zcjoinsplitdoublespend.py',
-    'zkey_import_export.py',
-    'reorg_limit.py',
     'getblocktemplate.py',
     'bip65-cltv-p2p.py',
     'bipdersig-p2p.py',
@@ -169,10 +179,7 @@ testScripts = [
     'p2p_txexpiringsoon.py',
     'p2p_node_bloom.py',
     'regtest_signrawtransaction.py',
-    'finalsaplingroot.py',
     'shorter_block_times.py',
-    'sprout_sapling_migration.py',
-    'turnstile.py',
     'mining_shielded_coinbase.py',
     'coinbase_funding_streams.py',
     'framework.py',
@@ -181,22 +188,26 @@ testScripts = [
     'upgrade_golden.py',
     'post_heartwood_rollback.py',
     'feature_logging.py',
-    'remove_sprout_shielding.py',
     'feature_walletfile.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
 
 testScriptsExt = [
-    'getblocktemplate_longpoll.py',
-    'getblocktemplate_proposals.py',
     'pruning.py',
+    # vv Tests less than 20m vv
+    'smartfees.py',
+    # vv Tests less than 5m vv
+    # vv Tests less than 2m vv
+    'getblocktemplate_longpoll.py',
+    # vv Tests less than 60s vv
+    'rpcbind_test.py',
+    # vv Tests less than 30s vv
+    'getblocktemplate_proposals.py',
     'forknotify.py',
     'hardforkdetection.py',
     'invalidateblock.py',
     'receivedby.py',
-    'rpcbind_test.py',
-    'smartfees.py',
     'maxblocksinflight.py',
     'invalidblockrequest.py',
 #    'forknotify.py',