Merge #11965: qa: Note on test order in test_runner

MarcoFalke · MarcoFalke · commit d38d1a3e75aa · 2018-01-03T12:07:52.000+02:00
fadf60e qa: Note on test order in test_runner (MarcoFalke) Pull request description: C.f. #11964 Tree-SHA512: 5f087965093722d9e7a3febddcc187e412bd0636a7ed2da60111668fe3bba6668110e25a38ddcccc0d0aae132611c56fa72f3f0c473fb3fb59e38be445edfcd5
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
@@ -130,6 +130,8 @@
     '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 = [

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@`
`130`	`130`	`'feature_logging.py',`
`131`	`131`	`'node_network_limited.py',`
`132`	`132`	`'conf_args.py',`
	`133`	`+ # Don't append tests at the end to avoid merge conflicts`
	`134`	`+ # Put them in a random line within the section that fits their approximate run-time`
`133`	`135`	`]`
`134`	`136`
`135`	`137`	`EXTENDED_SCRIPTS = [`