diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-04-18 09:25:36 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-04-18 09:26:43 +0200 |
| commit | 9111df9673beb6d6616d491a5478f09b5f14d040 (patch) | |
| tree | 41eb7cd82b135a8ecc617a87854434f67fd53676 | |
| parent | a86255b11633fccceffee66e5b79e5954330f3f9 (diff) | |
| parent | 637706dc9ea9244954252a4fd7d8786bf93e3b67 (diff) | |
| download | bitcoin-9111df9673beb6d6616d491a5478f09b5f14d040.tar.xz | |
Merge #10219: Tests: Order Python Tests Differently
637706d Tests: Put Extended tests first when they're included (Jimmy Song)
Tree-SHA512: 0a720b2443b3e65f4ad548ecdf822468460fc4f4ecf32385dd79511a01c9ea4c94f0bf765ca593705b19baee1bae254dfcc3952da64b9c51d75b7da7abcdcd28
| -rw-r--r-- | test/README.md | 2 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/test/README.md b/test/README.md index dec8db960d..b40052b898 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 fc4e675fec..3a3fa31ec3 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -148,7 +148,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. @@ -226,10 +227,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: |