Skip to content

Commit 637706d

Browse files
committed
Tests: Put Extended tests first when they're included
* Added documentation in tests/README.md about enabling wallet, utils and daemon. * Change ordering to make the long-running EXTENDED_TESTS go first.
1 parent 2584925 commit 637706d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

test/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ The ZMQ functional test requires a python ZMQ library. To install it:
2525
Running tests locally
2626
=====================
2727

28+
Build for your system first. Be sure to enable wallet, utils and daemon when you configure. Tests will not run otherwise.
29+
2830
Functional tests
2931
----------------
3032

test/functional/test_runner.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@
140140
'replace-by-fee.py',
141141
]
142142

143-
ALL_SCRIPTS = BASE_SCRIPTS + ZMQ_SCRIPTS + EXTENDED_SCRIPTS
143+
# Place EXTENDED_SCRIPTS first since it has the 3 longest running tests
144+
ALL_SCRIPTS = EXTENDED_SCRIPTS + BASE_SCRIPTS + ZMQ_SCRIPTS
144145

145146
NON_SCRIPTS = [
146147
# These are python files that live in the functional tests directory, but are not test scripts.
@@ -217,10 +218,9 @@ def main():
217218
if enable_zmq:
218219
test_list += ZMQ_SCRIPTS
219220
if args.extended:
220-
test_list += EXTENDED_SCRIPTS
221-
# TODO: BASE_SCRIPTS and EXTENDED_SCRIPTS are sorted by runtime
222-
# (for parallel running efficiency). This combined list will is no
223-
# longer sorted.
221+
# place the EXTENDED_SCRIPTS first since the three longest ones
222+
# are there and the list is shorter
223+
test_list = EXTENDED_SCRIPTS + test_list
224224

225225
# Remove the test cases that the user has explicitly asked to exclude.
226226
if args.exclude:

0 commit comments

Comments
 (0)