diff options
| author | Pablo M. Bermudo Garay <pablombg@gmail.com> | 2015-12-01 23:45:22 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-14 20:09:26 +0100 |
| commit | 10a935abb110beb9e0b868fbf3ca5b3c80dd93f4 (patch) | |
| tree | f42ffc51c3d6e835fa0e4d30b218cfee37c9a5c5 /tests | |
| parent | a248ba918dcba2866fe47d5d716d7f0f04abd40f (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regression/any/ct.t | 3 | ||||
| -rw-r--r-- | tests/regression/ip/icmp.t | 2 | ||||
| -rw-r--r-- | tests/regression/ip6/icmpv6.t | 2 | ||||
| -rw-r--r-- | tests/regression/ip6/snat.t | 1 | ||||
| -rwxr-xr-x | tests/regression/nft-test.py | 2 |
5 files changed, 2 insertions, 8 deletions
diff --git a/tests/regression/any/ct.t b/tests/regression/any/ct.t index ab4b167d..059402e2 100644 --- 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 9c2aba78..bd00f5ca 100644 --- 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 c86c8251..fca903f6 100644 --- 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 44ca9e4f..37bf1a1d 100644 --- 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 0b0be5dd..9d623b70 100755 --- 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: |