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.
This commit is contained in:
Jimmy Song 2017-04-17 15:20:35 -07:00
parent 2584925077
commit 637706dc9e
2 changed files with 7 additions and 5 deletions

View file

@ -25,6 +25,8 @@ The ZMQ functional test requires a python ZMQ library. To install it:
Running tests locally Running tests locally
===================== =====================
Build for your system first. Be sure to enable wallet, utils and daemon when you configure. Tests will not run otherwise.
Functional tests Functional tests
---------------- ----------------

View file

@ -140,7 +140,8 @@ EXTENDED_SCRIPTS = [
'replace-by-fee.py', 'replace-by-fee.py',
] ]
ALL_SCRIPTS = BASE_SCRIPTS + ZMQ_SCRIPTS + EXTENDED_SCRIPTS # Place EXTENDED_SCRIPTS first since it has the 3 longest running tests
ALL_SCRIPTS = EXTENDED_SCRIPTS + BASE_SCRIPTS + ZMQ_SCRIPTS
NON_SCRIPTS = [ NON_SCRIPTS = [
# These are python files that live in the functional tests directory, but are not test scripts. # These are python files that live in the functional tests directory, but are not test scripts.
@ -217,10 +218,9 @@ def main():
if enable_zmq: if enable_zmq:
test_list += ZMQ_SCRIPTS test_list += ZMQ_SCRIPTS
if args.extended: if args.extended:
test_list += EXTENDED_SCRIPTS # place the EXTENDED_SCRIPTS first since the three longest ones
# TODO: BASE_SCRIPTS and EXTENDED_SCRIPTS are sorted by runtime # are there and the list is shorter
# (for parallel running efficiency). This combined list will is no test_list = EXTENDED_SCRIPTS + test_list
# longer sorted.
# Remove the test cases that the user has explicitly asked to exclude. # Remove the test cases that the user has explicitly asked to exclude.
if args.exclude: if args.exclude: