From 637706dc9ea9244954252a4fd7d8786bf93e3b67 Mon Sep 17 00:00:00 2001 From: Jimmy Song Date: Mon, 17 Apr 2017 15:20:35 -0700 Subject: 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. --- test/functional/test_runner.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/functional') diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index bb12328ec1..32ef199600 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -140,7 +140,8 @@ EXTENDED_SCRIPTS = [ '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 = [ # 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: test_list += ZMQ_SCRIPTS if args.extended: - test_list += EXTENDED_SCRIPTS - # TODO: BASE_SCRIPTS and EXTENDED_SCRIPTS are sorted by runtime - # (for parallel running efficiency). This combined list will is no - # longer sorted. + # place the EXTENDED_SCRIPTS first since the three longest ones + # are there and the list is shorter + test_list = EXTENDED_SCRIPTS + test_list # Remove the test cases that the user has explicitly asked to exclude. if args.exclude: -- cgit v1.2.3