tests: remove useless logic

In the test files, some lines defining tables was commented out with a
minus "-" sign, also used to mark broken rules. This commit replaces
these signs with actual comments "#" and removes the code that handled
the situation.

Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/regression/any/ct.t b/tests/regression/any/ct.t
index ab4b167df8ecec584aada5e0032f6237698d79a1..059402e241f7988fe0bde830f3033df736ca6a95 100644 (file)
--- a/tests/regression/any/ct.t
+++ b/tests/regression/any/ct.t
@@ -1,9 +1,6 @@
 *ip;test-ip4
 *ip6;test-ip6
 *inet;test-inet
-# ct expresion is not supported in arp and bridge family yet.
-- *arp;test-arp
-- *bridge;test-bridge
 
 :output;type filter hook output priority 0
 

diff --git a/tests/regression/ip/icmp.t b/tests/regression/ip/icmp.t
index 9c2aba786e5b2745ea677890e0fb3e9dba91eb7f..bd00f5caea00629dd3a0ea43df00458e70b376fe 100644 (file)
--- a/tests/regression/ip/icmp.t
+++ b/tests/regression/ip/icmp.t
@@ -1,6 +1,6 @@
 *ip;test-ip4
 # BUG: There is a bug with icmp protocol and inet family.
-- *inet;test-inet
+# *inet;test-inet
 :input;type filter hook input priority 0
 
 icmp type echo-reply accept;ok

diff --git a/tests/regression/ip6/icmpv6.t b/tests/regression/ip6/icmpv6.t
index c86c8251eeedb90accb0408eedbcfcdec9ff8316..fca903f6db22e3972df1aad35decdbbb14f77274 100644 (file)
--- a/tests/regression/ip6/icmpv6.t
+++ b/tests/regression/ip6/icmpv6.t
@@ -1,6 +1,6 @@
 *ip6;test-ip6
 # BUG: There is a bug with icmpv6 and inet tables
-- *inet;test-inet
+# *inet;test-inet
 :input;type filter hook input priority 0
 
 icmpv6 type destination-unreachable accept;ok

diff --git a/tests/regression/ip6/snat.t b/tests/regression/ip6/snat.t
index 44ca9e4fcfc14f2fcf2a55541fcacee0159a545b..37bf1a1df0216ef067b35e44f3899c00ddbbe438 100644 (file)
--- a/tests/regression/ip6/snat.t
+++ b/tests/regression/ip6/snat.t
@@ -1,5 +1,4 @@
 *ip6;test-ip6
-- *inet;test-inet
 :postrouting;type nat hook postrouting priority 0
 
 tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::80-100

diff --git a/tests/regression/nft-test.py b/tests/regression/nft-test.py
index 0b0be5dd0ac099ed48dde0724c3df996b9c461f3..9d623b70642ec4e7d35d5adea3a8e09ade3c351a 100755 (executable)
--- a/tests/regression/nft-test.py
+++ b/tests/regression/nft-test.py
@@ -809,8 +809,6 @@ def run_test_file(filename, force_all_family_option, specific_file):
         # Rule
         rule = line.split(';')  # rule[1] Ok or FAIL
         if line[0] == "-":  # Run omitted lines
-            if line[1:].find("*") != -1:
-                continue
             if need_fix_option:
                 rule[0] = rule[0].rstrip()[1:].strip()
             else: