Skip to content

Commit 1647a11

Browse files
committed
tests: Reorder longer running tests in test_runner
The logest running tests should be at the front of the list in test_runner.py. Since compiling with --enable-debug can have a significant effect on test runtime, the order is based on the runtime with that option configured.
1 parent ff6c9fe commit 1647a11

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

test/functional/test_runner.py

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -90,56 +90,81 @@
9090
BASE_SCRIPTS = [
9191
# Scripts that are run by default.
9292
# Longest test should go first, to favor running tests in parallel
93-
'wallet_hd.py --legacy-wallet',
94-
'wallet_hd.py --descriptors',
95-
'wallet_backup.py --legacy-wallet',
96-
'wallet_backup.py --descriptors',
9793
# vv Tests less than 5m vv
94+
'feature_fee_estimation.py',
95+
'feature_taproot.py',
96+
'feature_block.py',
97+
# vv Tests less than 2m vv
9898
'mining_getblocktemplate_longpoll.py',
99+
'p2p_segwit.py',
99100
'feature_maxuploadtarget.py',
100-
'feature_block.py',
101+
'mempool_updatefromblock.py',
102+
'mempool_persist.py --descriptors',
103+
# vv Tests less than 60s vv
104+
'rpc_psbt.py --legacy-wallet',
105+
'rpc_psbt.py --descriptors',
101106
'wallet_fundrawtransaction.py --legacy-wallet',
102107
'wallet_fundrawtransaction.py --descriptors',
103-
'p2p_compactblocks.py',
104-
'p2p_compactblocks_blocksonly.py',
108+
'wallet_bumpfee.py --legacy-wallet',
109+
'wallet_bumpfee.py --descriptors',
110+
'wallet_import_rescan.py --legacy-wallet',
111+
'wallet_backup.py --legacy-wallet',
112+
'wallet_backup.py --descriptors',
105113
'feature_segwit.py --legacy-wallet',
106114
'feature_segwit.py --descriptors',
107-
# vv Tests less than 2m vv
115+
'p2p_tx_download.py',
116+
'wallet_avoidreuse.py --legacy-wallet',
117+
'wallet_avoidreuse.py --descriptors',
118+
'feature_abortnode.py',
119+
'wallet_address_types.py --legacy-wallet',
120+
'wallet_address_types.py --descriptors',
108121
'wallet_basic.py --legacy-wallet',
109122
'wallet_basic.py --descriptors',
110-
'wallet_labels.py --legacy-wallet',
111-
'wallet_labels.py --descriptors',
112-
'p2p_segwit.py',
123+
'feature_maxtipage.py',
124+
'wallet_multiwallet.py --legacy-wallet',
125+
'wallet_multiwallet.py --descriptors',
126+
'wallet_multiwallet.py --usecli',
127+
'p2p_dns_seeds.py',
128+
'wallet_groups.py --legacy-wallet',
129+
'wallet_groups.py --descriptors',
130+
'p2p_blockfilters.py',
131+
'feature_assumevalid.py',
132+
'wallet_taproot.py --descriptors',
133+
'feature_bip68_sequence.py',
134+
'rpc_packages.py',
135+
'rpc_bind.py --ipv4',
136+
'rpc_bind.py --ipv6',
137+
'rpc_bind.py --nonloopback',
138+
'p2p_headers_sync_with_minchainwork.py',
139+
'p2p_feefilter.py',
140+
'feature_csv_activation.py',
141+
'p2p_sendheaders.py',
142+
'wallet_listtransactions.py --legacy-wallet',
143+
'wallet_listtransactions.py --descriptors',
144+
# vv Tests less than 30s vv
145+
'p2p_invalid_messages.py',
146+
'rpc_createmultisig.py',
113147
'p2p_timeouts.py',
114-
'p2p_tx_download.py',
115-
'mempool_updatefromblock.py',
116148
'wallet_dump.py --legacy-wallet',
117-
'feature_taproot.py',
118149
'rpc_signer.py',
119150
'wallet_signer.py --descriptors',
120-
# vv Tests less than 60s vv
121-
'p2p_sendheaders.py',
122151
'wallet_importmulti.py --legacy-wallet',
123152
'mempool_limit.py',
124153
'rpc_txoutproof.py',
125154
'wallet_listreceivedby.py --legacy-wallet',
126155
'wallet_listreceivedby.py --descriptors',
127156
'wallet_abandonconflict.py --legacy-wallet',
128-
'p2p_dns_seeds.py',
129157
'wallet_abandonconflict.py --descriptors',
130-
'feature_csv_activation.py',
131-
'wallet_address_types.py --legacy-wallet',
132-
'wallet_address_types.py --descriptors',
133-
'feature_bip68_sequence.py',
134-
'p2p_feefilter.py',
135-
'rpc_packages.py',
136158
'feature_reindex.py',
137-
'feature_abortnode.py',
138-
# vv Tests less than 30s vv
159+
'wallet_labels.py --legacy-wallet',
160+
'wallet_labels.py --descriptors',
161+
'p2p_compactblocks.py',
162+
'p2p_compactblocks_blocksonly.py',
163+
'wallet_hd.py --legacy-wallet',
164+
'wallet_hd.py --descriptors',
139165
'wallet_keypool_topup.py --legacy-wallet',
140166
'wallet_keypool_topup.py --descriptors',
141167
'wallet_fast_rescan.py --descriptors',
142-
'feature_fee_estimation.py',
143168
'interface_zmq.py',
144169
'rpc_invalid_address_message.py',
145170
'interface_bitcoin_cli.py --legacy-wallet',
@@ -157,20 +182,12 @@
157182
'rpc_misc.py',
158183
'interface_rest.py',
159184
'mempool_spend_coinbase.py',
160-
'wallet_avoidreuse.py --legacy-wallet',
161-
'wallet_avoidreuse.py --descriptors',
162185
'wallet_avoid_mixing_output_types.py --descriptors',
163186
'mempool_reorg.py',
164-
'mempool_persist.py --descriptors',
165187
'p2p_block_sync.py',
166-
'wallet_multiwallet.py --legacy-wallet',
167-
'wallet_multiwallet.py --descriptors',
168-
'wallet_multiwallet.py --usecli',
169188
'wallet_createwallet.py --legacy-wallet',
170189
'wallet_createwallet.py --usecli',
171190
'wallet_createwallet.py --descriptors',
172-
'wallet_listtransactions.py --legacy-wallet',
173-
'wallet_listtransactions.py --descriptors',
174191
'wallet_watchonly.py --legacy-wallet',
175192
'wallet_watchonly.py --usecli --legacy-wallet',
176193
'wallet_reorgsrestore.py',
@@ -180,22 +197,17 @@
180197
'interface_usdt_net.py',
181198
'interface_usdt_utxocache.py',
182199
'interface_usdt_validation.py',
183-
'rpc_psbt.py --legacy-wallet',
184-
'rpc_psbt.py --descriptors',
185200
'rpc_users.py',
186201
'rpc_whitelist.py',
187202
'feature_proxy.py',
188203
'feature_syscall_sandbox.py',
189204
'wallet_signrawtransactionwithwallet.py --legacy-wallet',
190205
'wallet_signrawtransactionwithwallet.py --descriptors',
191206
'rpc_signrawtransactionwithkey.py',
192-
'p2p_headers_sync_with_minchainwork.py',
193207
'rpc_rawtransaction.py --legacy-wallet',
194-
'wallet_groups.py --legacy-wallet',
195208
'wallet_transactiontime_rescan.py --descriptors',
196209
'wallet_transactiontime_rescan.py --legacy-wallet',
197210
'p2p_addrv2_relay.py',
198-
'wallet_groups.py --descriptors',
199211
'p2p_compactblocks_hb.py',
200212
'p2p_disconnect_ban.py',
201213
'rpc_decodescript.py',
@@ -211,17 +223,14 @@
211223
'wallet_keypool.py --descriptors',
212224
'wallet_descriptor.py --descriptors',
213225
'wallet_miniscript.py --descriptors',
214-
'feature_maxtipage.py',
215226
'p2p_nobloomfilter_messages.py',
216227
'p2p_filter.py',
217228
'rpc_setban.py',
218229
'p2p_blocksonly.py',
219230
'mining_prioritisetransaction.py',
220231
'p2p_invalid_locator.py',
221232
'p2p_invalid_block.py',
222-
'p2p_invalid_messages.py',
223233
'p2p_invalid_tx.py',
224-
'feature_assumevalid.py',
225234
'example_test.py',
226235
'wallet_txn_doublespend.py --legacy-wallet',
227236
'wallet_multisig_descriptor_psbt.py --descriptors',
@@ -237,7 +246,6 @@
237246
'feature_rbf.py',
238247
'mempool_packages.py',
239248
'mempool_package_onemore.py',
240-
'rpc_createmultisig.py',
241249
'mempool_package_limits.py',
242250
'feature_versionbits_warning.py',
243251
'rpc_preciousblock.py',
@@ -254,18 +262,12 @@
254262
'feature_nulldummy.py',
255263
'mempool_accept.py',
256264
'mempool_expiry.py',
257-
'wallet_import_rescan.py --legacy-wallet',
258265
'wallet_import_with_label.py --legacy-wallet',
259266
'wallet_importdescriptors.py --descriptors',
260267
'wallet_upgradewallet.py --legacy-wallet',
261-
'rpc_bind.py --ipv4',
262-
'rpc_bind.py --ipv6',
263-
'rpc_bind.py --nonloopback',
264268
'wallet_crosschain.py',
265269
'mining_basic.py',
266270
'feature_signet.py',
267-
'wallet_bumpfee.py --legacy-wallet',
268-
'wallet_bumpfee.py --descriptors',
269271
'wallet_implicitsegwit.py --legacy-wallet',
270272
'rpc_named_arguments.py',
271273
'feature_startupnotify.py',
@@ -296,7 +298,6 @@
296298
'wallet_sendall.py --legacy-wallet',
297299
'wallet_sendall.py --descriptors',
298300
'wallet_create_tx.py --descriptors',
299-
'wallet_taproot.py --descriptors',
300301
'wallet_inactive_hdchains.py --legacy-wallet',
301302
'p2p_fingerprint.py',
302303
'feature_uacomment.py',
@@ -309,7 +310,6 @@
309310
'p2p_add_connections.py',
310311
'feature_bind_port_discover.py',
311312
'p2p_unrequested_blocks.py',
312-
'p2p_blockfilters.py',
313313
'p2p_message_capture.py',
314314
'feature_includeconf.py',
315315
'feature_addrman.py',

0 commit comments

Comments
 (0)