aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-09-16 15:06:48 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-09-16 15:06:54 -0400
commit3832c25f176753b7ddb724c26ee7543fb1e1819e (patch)
treee5f61dc3db47c9ead2be08155e5c304497af50d3 /test
parentc53e083a49291b611d278a8db24ff235c1202e43 (diff)
parentd641c29a5a7dcbf186e32af2e22cd3601e5c49fb (diff)
downloadbitcoin-3832c25f176753b7ddb724c26ee7543fb1e1819e.tar.xz
Merge #14225: tests: Reorder tests and move most of extended tests up to normal tests
d641c29a5a travis: Run feature_dbcrash functional tests in cron job (Chun Kuan Lee) c0d947d725 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
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/test_runner.py33
1 files changed, 14 insertions, 19 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 37b378e9ca..37a3c1c602 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -58,9 +58,12 @@ TRAVIS_TIMEOUT_DURATION = 20 * 60
BASE_SCRIPTS = [
# Scripts that are run by the travis build process.
# Longest test should go first, to favor running tests in parallel
+ 'feature_fee_estimation.py',
'wallet_hd.py',
'wallet_backup.py',
# vv Tests less than 5m vv
+ 'mining_getblocktemplate_longpoll.py',
+ 'feature_maxuploadtarget.py',
'feature_block.py',
'rpc_fundrawtransaction.py',
'p2p_compactblocks.py',
@@ -69,6 +72,7 @@ BASE_SCRIPTS = [
'wallet_basic.py',
'wallet_labels.py',
'p2p_segwit.py',
+ 'p2p_timeouts.py',
'wallet_dump.py',
'wallet_listtransactions.py',
# vv Tests less than 60s vv
@@ -82,6 +86,8 @@ BASE_SCRIPTS = [
'feature_csv_activation.py',
'rpc_rawtransaction.py',
'wallet_address_types.py',
+ 'feature_bip68_sequence.py',
+ 'p2p_feefilter.py',
'feature_reindex.py',
# vv Tests less than 30s vv
'wallet_keypool_topup.py',
@@ -118,6 +124,14 @@ BASE_SCRIPTS = [
'p2p_invalid_locator.py',
'p2p_invalid_block.py',
'p2p_invalid_tx.py',
+ 'feature_assumevalid.py',
+ 'example_test.py',
+ 'wallet_txn_doublespend.py',
+ 'wallet_txn_clone.py --mineblock',
+ 'feature_notifications.py',
+ 'rpc_invalidateblock.py',
+ 'feature_rbf.py',
+ 'mempool_packages.py',
'rpc_createmultisig.py',
'feature_versionbits_warning.py',
'rpc_preciousblock.py',
@@ -162,26 +176,7 @@ EXTENDED_SCRIPTS = [
# These tests are not run by the travis build process.
# Longest test should go first, to favor running tests in parallel
'feature_pruning.py',
- # vv Tests less than 20m vv
- 'feature_fee_estimation.py',
- # vv Tests less than 5m vv
- 'feature_maxuploadtarget.py',
- 'mempool_packages.py',
'feature_dbcrash.py',
- # vv Tests less than 2m vv
- 'feature_bip68_sequence.py',
- 'mining_getblocktemplate_longpoll.py',
- 'p2p_timeouts.py',
- # vv Tests less than 60s vv
- 'p2p_feefilter.py',
- # vv Tests less than 30s vv
- 'feature_assumevalid.py',
- 'example_test.py',
- 'wallet_txn_doublespend.py',
- 'wallet_txn_clone.py --mineblock',
- 'feature_notifications.py',
- 'rpc_invalidateblock.py',
- 'feature_rbf.py',
]
# Place EXTENDED_SCRIPTS first since it has the 3 longest running tests