netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Pablo M. Bermudo Garay" <pablombg@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: "Pablo M. Bermudo Garay" <pablombg@gmail.com>
Subject: [PATCH nft 2/3] tests: remove useless logic
Date: Tue,  1 Dec 2015 23:45:22 +0100	[thread overview]
Message-ID: <1449009923-10726-2-git-send-email-pablombg@gmail.com> (raw)
In-Reply-To: <1449009923-10726-1-git-send-email-pablombg@gmail.com>

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>
---
 tests/regression/any/ct.t     | 4 ++--
 tests/regression/ip/icmp.t    | 2 +-
 tests/regression/ip6/icmpv6.t | 2 +-
 tests/regression/ip6/snat.t   | 2 +-
 tests/regression/nft-test.py  | 2 --
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/regression/any/ct.t b/tests/regression/any/ct.t
index ab4b167..0f5394a 100644
--- a/tests/regression/any/ct.t
+++ b/tests/regression/any/ct.t
@@ -2,8 +2,8 @@
 *ip6;test-ip6
 *inet;test-inet
 # ct expresion is not supported in arp and bridge family yet.
-- *arp;test-arp
-- *bridge;test-bridge
+# *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 9c2aba7..bd00f5c 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 c86c825..fca903f 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 44ca9e4..8f841da 100644
--- a/tests/regression/ip6/snat.t
+++ b/tests/regression/ip6/snat.t
@@ -1,5 +1,5 @@
 *ip6;test-ip6
-- *inet;test-inet
+# *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 0b0be5d..9d623b7 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:
-- 
2.6.2


  reply	other threads:[~2015-12-01 22:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-01 22:45 [PATCH nft 1/3] tests: add *.got files to .gitignore Pablo M. Bermudo Garay
2015-12-01 22:45 ` Pablo M. Bermudo Garay [this message]
2015-12-01 22:45 ` [PATCH nft 3/3] tests: fix crash when rule test is malformed Pablo M. Bermudo Garay
2015-12-10 17:28 ` [PATCH nft 1/3] tests: add *.got files to .gitignore Pablo Neira Ayuso
2015-12-14 19:39 ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449009923-10726-2-git-send-email-pablombg@gmail.com \
    --to=pablombg@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).