From fa4535df574067700ed7d2227ae03605075b8730 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 25 Mar 2017 15:16:26 +0100
Subject: [PATCH] [qa] combine_logs: Use ordered list for logfiles

---
 test/functional/combine_logs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/functional/combine_logs.py b/test/functional/combine_logs.py
index 0c2f60172..3ca74ea35 100755
--- a/test/functional/combine_logs.py
+++ b/test/functional/combine_logs.py
@@ -6,8 +6,8 @@ to write to an outputfile."""
 
 import argparse
 from collections import defaultdict, namedtuple
-import glob
 import heapq
+import itertools
 import os
 import re
 import sys
@@ -49,7 +49,10 @@ def read_logs(tmp_dir):
     for each of the input log files."""
 
     files = [("test", "%s/test_framework.log" % tmp_dir)]
-    for i, logfile in enumerate(glob.glob("%s/node*/regtest/debug.log" % tmp_dir)):
+    for i in itertools.count():
+        logfile = "{}/node{}/regtest/debug.log".format(tmp_dir, i)
+        if not os.path.isfile(logfile):
+            break
         files.append(("node%d" % i, logfile))
 
     return heapq.merge(*[get_log_events(source, f) for source, f in files])