aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-05-03 17:03:11 -0400
committerMarcoFalke <falke.marco@gmail.com>2019-05-03 17:03:16 -0400
commitf19a3b2ded4b86d859c0a464f550e0743af78ae3 (patch)
treed8c637f9a25f40b4d4d8bfaed8ca0633a2e152b6
parent94daebf327e38ebb0c578bffbabe76961e11d9ee (diff)
parentfa08c5cb993f07fd4309f2a6bd9ef4696f07e24c (diff)
Merge #15949: test_runner: Move pruning back to extended
fa08c5cb99 test_runner: Move pruning back to extended (MarcoFalke) Pull request description: This reverts fafb55e2c2b257efd4e584f72adf62401c01d573, since the test is still too slow to run with asan enabled on a network hdd ACKs for commit fa08c5: jnewbery: utACK fa08c5cb993f07fd4309f2a6bd9ef4696f07e24c jonasschnelli: utACK fa08c5cb993f07fd4309f2a6bd9ef4696f07e24c Tree-SHA512: de16786b9d507a72210805c3e9eef360e5fc3d4bc3a81f7175b6cc70d1bc426cde7ac97bc0d1a0d4e0813067e1e251c2dd49256552cc6b52446b475251b7c32b
-rwxr-xr-xtest/functional/test_runner.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index d406ee3229..ec5d6f1715 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -66,10 +66,16 @@ if os.name != 'nt' or sys.getwindowsversion() >= (10, 0, 14393):
TEST_EXIT_PASSED = 0
TEST_EXIT_SKIPPED = 77
+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',
+]
+
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',
@@ -197,12 +203,6 @@ BASE_SCRIPTS = [
# Put them in a random line within the section that fits their approximate run-time
]
-EXTENDED_SCRIPTS = [
- # These tests are not run by the travis build process.
- # Longest test should go first, to favor running tests in parallel
- 'feature_dbcrash.py',
-]
-
# Place EXTENDED_SCRIPTS first since it has the 3 longest running tests
ALL_SCRIPTS = EXTENDED_SCRIPTS + BASE_SCRIPTS