From 3b7a61c2980493087d447cf2379003655f0eebe9 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Wed, 15 Jul 2015 15:24:18 +0200
Subject: tests: avoid more warnings

... 2001:838:35f:1::-2001:838:35f:2:: :80-100' mismatches
... 2001:838:35f:1::-2001:838:35f:2:::80-100'

nft accepts both, so just alter test to not complain.

Also, fix test script to display the expected output rather than
the input.  Otherwise, a rule like
some_input;ok;expected_output

may display nonsensical message like
warning: some_input mismatches some_input

This also fixes the icmpv6 test accordingly, nft displays ranges
correctly.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 tests/regression/inet/tcp.t   |  2 +-
 tests/regression/ip6/dnat.t   |  4 ++--
 tests/regression/ip6/icmpv6.t | 10 +++++-----
 tests/regression/ip6/snat.t   |  4 ++--
 tests/regression/nft-test.py  |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests/regression')

diff --git a/tests/regression/inet/tcp.t b/tests/regression/inet/tcp.t
index 5eb3882c..95267da5 100644
--- a/tests/regression/inet/tcp.t
+++ b/tests/regression/inet/tcp.t
@@ -33,7 +33,7 @@ tcp sport 8080 drop;ok
 tcp sport 1024 tcp dport 22;ok
 tcp sport 1024 tcp dport 22 tcp sequence 0;ok
 
-tcp sequence 0 tcp sport 1024 tcp dport 22;ok
+tcp sequence 0 tcp sport 1024 tcp dport 22;ok;tcp sport 1024 tcp dport 22 tcp sequence 0
 tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok
 
 tcp sequence 22;ok
diff --git a/tests/regression/ip6/dnat.t b/tests/regression/ip6/dnat.t
index a2555c72..83412258 100644
--- a/tests/regression/ip6/dnat.t
+++ b/tests/regression/ip6/dnat.t
@@ -1,5 +1,5 @@
 *ip6;test-ip6
 :prerouting;type nat hook prerouting priority 0
 
-tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok
-tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100;ok
+tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::80-100;ok
+tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100;ok;tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::100
diff --git a/tests/regression/ip6/icmpv6.t b/tests/regression/ip6/icmpv6.t
index 7a86ee9e..c86c8251 100644
--- a/tests/regression/ip6/icmpv6.t
+++ b/tests/regression/ip6/icmpv6.t
@@ -1,4 +1,4 @@
-*ip6;test-ip4
+*ip6;test-ip6
 # BUG: There is a bug with icmpv6 and inet tables
 - *inet;test-inet
 :input;type filter hook input priority 0
@@ -23,7 +23,7 @@ icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept;ok
 - icmpv6 type != {mld-listener-query, time-exceeded, nd-router-advert} accept;ok
 
 icmpv6 code 4;ok
-icmpv6 code 3-66;ok;icmpv6 code >= 3 icmpv6 code <= 66
+icmpv6 code 3-66;ok
 icmpv6 code {5, 6, 7} accept;ok
 - icmpv6 code != {3, 66, 34};ok
 icmpv6 code { 3-66};ok
@@ -31,7 +31,7 @@ icmpv6 code { 3-66};ok
 
 icmpv6 checksum 2222 log;ok
 icmpv6 checksum != 2222 log;ok
-icmpv6 checksum 222-226;ok;icmpv6 checksum >= 222 icmpv6 checksum <= 226
+icmpv6 checksum 222-226;ok
 icmpv6 checksum != 2222 log;ok
 icmpv6 checksum { 222, 226};ok
 - icmpv6 checksum != { 222, 226};ok
@@ -81,8 +81,8 @@ icmpv6 sequence {3, 4, 5, 6, 7} accept;ok
 
 icmpv6 sequence {2, 4};ok
 - icmpv6 sequence != {2, 4};ok
-icmpv6 sequence 2-4;ok;icmpv6 sequence >= 2 icmpv6 sequence <= 4
-icmpv6 sequence != 2-4;ok;icmpv6 sequence < 2 icmpv6 sequence > 4
+icmpv6 sequence 2-4;ok
+icmpv6 sequence != 2-4;ok
 icmpv6 sequence { 2-4};ok
 - icmpv6 sequence != {2-4};ok
 
diff --git a/tests/regression/ip6/snat.t b/tests/regression/ip6/snat.t
index 73452752..44ca9e4f 100644
--- a/tests/regression/ip6/snat.t
+++ b/tests/regression/ip6/snat.t
@@ -2,5 +2,5 @@
 - *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:: :100;ok
+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
+tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::100;ok
diff --git a/tests/regression/nft-test.py b/tests/regression/nft-test.py
index 7823f44c..153f5e8b 100755
--- a/tests/regression/nft-test.py
+++ b/tests/regression/nft-test.py
@@ -509,7 +509,7 @@ def rule_add(rule, table_list, chain_list, filename, lineno,
 
                             warning += 1
                             print_differences_warning(filename, lineno,
-                                                      rule[0], rule_output,
+                                                      teoric_exit.rstrip(), rule_output,
                                                       cmd)
 
                             if not force_all_family_option:
-- 
cgit v1.2.3