diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-01-03 12:06:04 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-01-03 12:07:52 +0200 |
| commit | d38d1a3e75aa97ffa8755ddd431754a6d0942964 (patch) | |
| tree | 886c6b9743084b2764921c89bf071f81d233568b /test | |
| parent | c04cb48df9616fe107f6514f3cd12e77e3da66ab (diff) | |
| parent | fadf60e381006aa27689971771e83426fb7c0daa (diff) | |
Merge #11965: qa: Note on test order in test_runner
fadf60e381 qa: Note on test order in test_runner (MarcoFalke)
Pull request description:
C.f. #11964
Tree-SHA512: 5f087965093722d9e7a3febddcc187e412bd0636a7ed2da60111668fe3bba6668110e25a38ddcccc0d0aae132611c56fa72f3f0c473fb3fb59e38be445edfcd5
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index bfd1192d3a..c0828d6647 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -130,6 +130,8 @@ BASE_SCRIPTS= [ 'feature_logging.py', 'node_network_limited.py', 'conf_args.py', + # Don't append tests at the end to avoid merge conflicts + # Put them in a random line within the section that fits their approximate run-time ] EXTENDED_SCRIPTS = [ |