From fadf60e381006aa27689971771e83426fb7c0daa Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 20 Dec 2017 15:05:31 -0500
Subject: [PATCH] qa: Note on test order in test_runner

---
 test/functional/test_runner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index bfd1192d3..c0828d664 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 = [