From 7fa60a1c73f152f9aaf956c6656af8ae4210fc2a Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 18 Apr 2017 09:25:36 +0200 Subject: [PATCH] Merge #10219: Tests: Order Python Tests Differently 637706d Tests: Put Extended tests first when they're included (Jimmy Song) Tree-SHA512: 0a720b2443b3e65f4ad548ecdf822468460fc4f4ecf32385dd79511a01c9ea4c94f0bf765ca593705b19baee1bae254dfcc3952da64b9c51d75b7da7abcdcd28 --- test/README.md | 2 ++ test/functional/test_runner.py | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/README.md b/test/README.md index aaaa0406c..dd258dd08 100644 --- a/test/README.md +++ b/test/README.md @@ -25,6 +25,8 @@ The ZMQ functional test requires a python ZMQ library. To install it: 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 ---------------- diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 89ff1e5fb..9a0ddfc5d 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -140,7 +140,8 @@ EXTENDED_SCRIPTS = [ 'p2p-acceptblock.py', # NOTE: needs dash_hash to pass ] -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. @@ -212,10 +213,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: