Skip to content

Commit 3832c25

Browse files
author
MarcoFalke
committed
Merge #14225: tests: Reorder tests and move most of extended tests up to normal tests
d641c29 travis: Run feature_dbcrash functional tests in cron job (Chun Kuan Lee) c0d947d tests: Reorder tests and move most of extended tests up to normal tests (Chun Kuan Lee) Pull request description: The travis should run almost all jobs unless it takes really long time, however it does not take too long for now. So it's time for moving it to normal job. (The test sort is to see how many conflict will this cause, will drop it if there are too many) The first commit can be reviewed by `git diff --color-moved=plain` Tree-SHA512: db6bd5b1f19de2f729012adda6ed00ca989071fd40a20710c0ff2579b5bd008edcf7421c1ad56d5f0752354e7df408f58351129d35a1ab7f4a6caa9d315df2ec
2 parents c53e083 + d641c29 commit 3832c25

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

.travis/test_06_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if [ "$RUN_BENCH" = "true" ]; then
5757
fi
5858

5959
if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
60-
extended="--extended --exclude feature_pruning,feature_dbcrash"
60+
extended="--extended --exclude feature_pruning"
6161
fi
6262

6363
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then

test/functional/test_runner.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@
5858
BASE_SCRIPTS = [
5959
# Scripts that are run by the travis build process.
6060
# Longest test should go first, to favor running tests in parallel
61+
'feature_fee_estimation.py',
6162
'wallet_hd.py',
6263
'wallet_backup.py',
6364
# vv Tests less than 5m vv
65+
'mining_getblocktemplate_longpoll.py',
66+
'feature_maxuploadtarget.py',
6467
'feature_block.py',
6568
'rpc_fundrawtransaction.py',
6669
'p2p_compactblocks.py',
@@ -69,6 +72,7 @@
6972
'wallet_basic.py',
7073
'wallet_labels.py',
7174
'p2p_segwit.py',
75+
'p2p_timeouts.py',
7276
'wallet_dump.py',
7377
'wallet_listtransactions.py',
7478
# vv Tests less than 60s vv
@@ -82,6 +86,8 @@
8286
'feature_csv_activation.py',
8387
'rpc_rawtransaction.py',
8488
'wallet_address_types.py',
89+
'feature_bip68_sequence.py',
90+
'p2p_feefilter.py',
8591
'feature_reindex.py',
8692
# vv Tests less than 30s vv
8793
'wallet_keypool_topup.py',
@@ -118,6 +124,14 @@
118124
'p2p_invalid_locator.py',
119125
'p2p_invalid_block.py',
120126
'p2p_invalid_tx.py',
127+
'feature_assumevalid.py',
128+
'example_test.py',
129+
'wallet_txn_doublespend.py',
130+
'wallet_txn_clone.py --mineblock',
131+
'feature_notifications.py',
132+
'rpc_invalidateblock.py',
133+
'feature_rbf.py',
134+
'mempool_packages.py',
121135
'rpc_createmultisig.py',
122136
'feature_versionbits_warning.py',
123137
'rpc_preciousblock.py',
@@ -162,26 +176,7 @@
162176
# These tests are not run by the travis build process.
163177
# Longest test should go first, to favor running tests in parallel
164178
'feature_pruning.py',
165-
# vv Tests less than 20m vv
166-
'feature_fee_estimation.py',
167-
# vv Tests less than 5m vv
168-
'feature_maxuploadtarget.py',
169-
'mempool_packages.py',
170179
'feature_dbcrash.py',
171-
# vv Tests less than 2m vv
172-
'feature_bip68_sequence.py',
173-
'mining_getblocktemplate_longpoll.py',
174-
'p2p_timeouts.py',
175-
# vv Tests less than 60s vv
176-
'p2p_feefilter.py',
177-
# vv Tests less than 30s vv
178-
'feature_assumevalid.py',
179-
'example_test.py',
180-
'wallet_txn_doublespend.py',
181-
'wallet_txn_clone.py --mineblock',
182-
'feature_notifications.py',
183-
'rpc_invalidateblock.py',
184-
'feature_rbf.py',
185180
]
186181

187182
# Place EXTENDED_SCRIPTS first since it has the 3 longest running tests

0 commit comments

Comments
 (0)