From: Phil Sutter <phil@nwl.cc>
Date: Fri, 27 Sep 2019 10:07:46 +0000 (+0200)
Subject: iptables-test: Run tests in lexical order
X-Git-Tag: v1.8.4~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=124587ad42cd7b83e3204b49f1f1e2a0b782c320;p=thirdparty%2Fiptables.git

iptables-test: Run tests in lexical order

To quickly see if a given test was run or not, sort the file list. Also
filter non-test files right when preparing the list.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/iptables-test.py b/iptables-test.py
index 2aac8ef2..fdb4e6a3 100755
--- a/iptables-test.py
+++ b/iptables-test.py
@@ -359,10 +359,14 @@ def main():
         print("Couldn't open log file %s" % LOGFILE)
         return
 
-    file_list = [os.path.join(EXTENSIONS_PATH, i)
-                 for i in os.listdir(EXTENSIONS_PATH)]
     if args.filename:
         file_list = [args.filename]
+    else:
+        file_list = [os.path.join(EXTENSIONS_PATH, i)
+                     for i in os.listdir(EXTENSIONS_PATH)
+                     if i.endswith('.t')]
+        file_list.sort()
+
     for filename in file_list:
         file_tests, file_passed = run_test_file(filename, args.netns)
         if file_tests: