diff options
author | Liping Zhang <liping.zhang@spreadtrum.com> | 2016-06-11 13:05:14 +0800 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-06-15 13:58:15 +0200 |
commit | 67ea3f3c1b14731d93618c426dd8a5d28aa314a1 (patch) | |
tree | 839cc2e6b8474c2ba98f15329510466f112cd6ab | |
parent | 3503738f77cdbe521da1054a37f59ac2e442b4cf (diff) |
tests: shell: make testcases which using tcp/udp port more rubost
In my mechain, port 12345 is mapped to italk in /etc/services:
italk 12345/tcp # Italk Chat System
So when we add nft rule with udp port "12345", nft list ruleset
will displayed it as "italk", that cause the result is not same
with expected, then testcase fail.
Add "-nn" option when dump the rulesets from the kernel, make
testcases which using tcp/udp port more rubost.
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Acked-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rwxr-xr-x | tests/shell/testcases/netns/0001nft-f_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/netns/0002loosecommands_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/netns/0003many_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/nft-f/0002rollback_rule_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/nft-f/0003rollback_jump_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/nft-f/0004rollback_set_0 | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/nft-f/0005rollback_map_0 | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0 index e616363e..663167d7 100755 --- a/tests/shell/testcases/netns/0001nft-f_0 +++ b/tests/shell/testcases/netns/0001nft-f_0 @@ -99,7 +99,7 @@ if [ $? -ne 0 ] ; then exit 1 fi -KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" +KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0 index 1600d946..fbaa3865 100755 --- a/tests/shell/testcases/netns/0002loosecommands_0 +++ b/tests/shell/testcases/netns/0002loosecommands_0 @@ -53,7 +53,7 @@ RULESET="table ip t { } }" -KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" +KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0 index ad71ae37..f8853ee5 100755 --- a/tests/shell/testcases/netns/0003many_0 +++ b/tests/shell/testcases/netns/0003many_0 @@ -104,7 +104,7 @@ function test_netns() exit 1 fi - KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" + KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)" if [ "$RULESET" != "$KERNEL_RULESET" ] ; then echo "E: ruleset in netns $NETNS_NAME differs from the loaded" >&2 DIFF="$(which diff)" diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0 index b1e224c3..5518c0b2 100755 --- a/tests/shell/testcases/nft-f/0002rollback_rule_0 +++ b/tests/shell/testcases/nft-f/0002rollback_rule_0 @@ -49,7 +49,7 @@ if [ $? -eq 0 ] ; then exit 1 fi -KERNEL_RULESET="$($NFT list ruleset)" +KERNEL_RULESET="$($NFT list ruleset -nn)" if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0 index 567a70e7..5c8c6852 100755 --- a/tests/shell/testcases/nft-f/0003rollback_jump_0 +++ b/tests/shell/testcases/nft-f/0003rollback_jump_0 @@ -49,7 +49,7 @@ if [ $? -eq 0 ] ; then exit 1 fi -KERNEL_RULESET="$($NFT list ruleset)" +KERNEL_RULESET="$($NFT list ruleset -nn)" if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0 index 3521aebd..db1c84cb 100755 --- a/tests/shell/testcases/nft-f/0004rollback_set_0 +++ b/tests/shell/testcases/nft-f/0004rollback_set_0 @@ -49,7 +49,7 @@ if [ $? -eq 0 ] ; then exit 1 fi -KERNEL_RULESET="$($NFT list ruleset)" +KERNEL_RULESET="$($NFT list ruleset -nn)" if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0 index 21b6a637..13bb9075 100755 --- a/tests/shell/testcases/nft-f/0005rollback_map_0 +++ b/tests/shell/testcases/nft-f/0005rollback_map_0 @@ -52,7 +52,7 @@ if [ $? -eq 0 ] ; then exit 1 fi -KERNEL_RULESET="$($NFT list ruleset)" +KERNEL_RULESET="$($NFT list ruleset -nn)" if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then DIFF="$(which diff)" |