diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-30 10:09:51 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-30 10:09:54 -0400 |
| commit | 45d8b717785187ab3be86802f872565149158c61 (patch) | |
| tree | d1fb178ccd6f37db0d2976bd79425438bc27d1f1 /test/functional/test_runner.py | |
| parent | ce6762030f814bc737bb0a097c17201e0b2edbc5 (diff) | |
| parent | fafb55e2c2b257efd4e584f72adf62401c01d573 (diff) | |
Merge #15696: [qa] test_runner: Move feature_pruning to base tests
fafb55e2c2 [qa] test_runner: Move feature_pruning to base tests (MarcoFalke)
8728a66782 [tests] fix block time in feature_pruning.py (John Newbery)
Pull request description:
ACKs for commit fafb55:
Tree-SHA512: 88abef94379fbad6629da11dccb080d5f0644490d6f2cc2756a33fac34bcf72e84245cef596dfae5a40f7a99b3f4da0dd85d306d4c1b452d310d3f36eef75a8b
Diffstat (limited to 'test/functional/test_runner.py')
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 86f334e942..d406ee3229 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -69,6 +69,7 @@ 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 + 'feature_pruning.py', 'feature_fee_estimation.py', 'wallet_hd.py', 'wallet_backup.py', @@ -199,7 +200,6 @@ BASE_SCRIPTS = [ 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', 'feature_dbcrash.py', ] |