Browse Source

Merge #10219: Tests: Order Python Tests Differently

637706d Tests: Put Extended tests first when they're included (Jimmy Song)

Tree-SHA512: 0a720b2443b3e65f4ad548ecdf822468460fc4f4ecf32385dd79511a01c9ea4c94f0bf765ca593705b19baee1bae254dfcc3952da64b9c51d75b7da7abcdcd28
0.15
MarcoFalke 8 years ago
parent
commit
9111df9673
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
  1. 2
      test/README.md
  2. 10
      test/functional/test_runner.py

2
test/README.md

@ -25,6 +25,8 @@ The ZMQ functional test requires a python ZMQ library. To install it: @@ -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
----------------

10
test/functional/test_runner.py

@ -148,7 +148,8 @@ EXTENDED_SCRIPTS = [ @@ -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(): @@ -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:

Loading…
Cancel
Save