aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/functional/test_runner.py2
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 = [