neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #10219: Tests: Order Python Tests Differently

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

Tree-SHA512: 0a720b2443b3e65f4ad548ecdf822468460fc4f4ecf32385dd79511a01c9ea4c94f0bf765ca593705b19baee1bae254dfcc3952da64b9c51d75b7da7abcdcd28
This commit is contained in:
MarcoFalke 2017-04-18 09:25:36 +02:00 committed by Pasta
parent 0b232fd1cf
commit 7fa60a1c73
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/README.md
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
---------------- ----------------

10
test/functional/test_runner.py
View File

@ -140,7 +140,8 @@ EXTENDED_SCRIPTS = [
'p2p-acceptblock.py', # NOTE: needs dash_hash to pass '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 = [ 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.
@ -212,10 +213,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: