diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-03-19 18:02:04 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-03-20 13:06:59 +0100 |
| commit | a55d79aa68266c790f3767ba240c3bdee247d511 (patch) | |
| tree | 169f9dc2049080676c8fb8f6b8388a4b79ac5944 /tests/shell/testcases | |
| parent | fe6a1af86d5a4b89bd116efdab419074261efd34 (diff) | |
tests/shell: Fix flowtable test cases
The major problem here was that existence of network interfaces 'eth0'
and 'wlan0' was assumed. Overcome this by just using 'lo' instead, which
exists even in newly created netns by default.
Another minor issue was false naming of 0004delete_after_add0 - the
expected return code is supposed to be separated by '_' from the
remaining filename.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases')
7 files changed, 14 insertions, 14 deletions
diff --git a/tests/shell/testcases/flowtable/0001flowtable_0 b/tests/shell/testcases/flowtable/0001flowtable_0 index 95b193dc..90b23dc3 100755 --- a/tests/shell/testcases/flowtable/0001flowtable_0 +++ b/tests/shell/testcases/flowtable/0001flowtable_0 @@ -3,7 +3,7 @@ EXPECTED='table inet t { flowtable f { hook ingress priority 10 - devices = { eth0, wlan0 } + devices = { lo } } chain c { diff --git a/tests/shell/testcases/flowtable/0002create_flowtable_0 b/tests/shell/testcases/flowtable/0002create_flowtable_0 index b6941c58..4c85c3f8 100755 --- a/tests/shell/testcases/flowtable/0002create_flowtable_0 +++ b/tests/shell/testcases/flowtable/0002create_flowtable_0 @@ -2,11 +2,11 @@ set -e $NFT add table t -$NFT add flowtable t f { hook ingress priority 10 \; devices = { eth0, wlan0 }\; } -if $NFT create flowtable t f { hook ingress priority 10 \; devices = { eth0, wlan0 }\; } 2>/dev/null ; then +$NFT add flowtable t f { hook ingress priority 10 \; devices = { lo }\; } +if $NFT create flowtable t f { hook ingress priority 10 \; devices = { lo }\; } 2>/dev/null ; then echo "E: flowtable creation not failing on existing set" >&2 exit 1 fi -$NFT add flowtable t f { hook ingress priority 10 \; devices = { eth0, wlan0 }\; } +$NFT add flowtable t f { hook ingress priority 10 \; devices = { lo }\; } exit 0 diff --git a/tests/shell/testcases/flowtable/0003add_after_flush_0 b/tests/shell/testcases/flowtable/0003add_after_flush_0 index 1f3cb18a..481c7edd 100755 --- a/tests/shell/testcases/flowtable/0003add_after_flush_0 +++ b/tests/shell/testcases/flowtable/0003add_after_flush_0 @@ -2,7 +2,7 @@ set -e $NFT add table x -$NFT add flowtable x y { hook ingress priority 0\; devices = { eth0, wlan0 }\;} +$NFT add flowtable x y { hook ingress priority 0\; devices = { lo }\;} $NFT flush ruleset $NFT add table x -$NFT add flowtable x y { hook ingress priority 0\; devices = { eth0, wlan0 }\;} +$NFT add flowtable x y { hook ingress priority 0\; devices = { lo }\;} diff --git a/tests/shell/testcases/flowtable/0004delete_after_add0 b/tests/shell/testcases/flowtable/0004delete_after_add0 deleted file mode 100755 index b72977b3..00000000 --- a/tests/shell/testcases/flowtable/0004delete_after_add0 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -$NFT add table x -$NFT add flowtable x y { hook ingress priority 0\; devices = { eth0, wlan0 }\;} -$NFT delete flowtable x y diff --git a/tests/shell/testcases/flowtable/0004delete_after_add_0 b/tests/shell/testcases/flowtable/0004delete_after_add_0 new file mode 100755 index 00000000..8d9a842d --- /dev/null +++ b/tests/shell/testcases/flowtable/0004delete_after_add_0 @@ -0,0 +1,6 @@ +#!/bin/bash + +set -e +$NFT add table x +$NFT add flowtable x y { hook ingress priority 0\; devices = { lo }\;} +$NFT delete flowtable x y diff --git a/tests/shell/testcases/flowtable/0005delete_in_use_1 b/tests/shell/testcases/flowtable/0005delete_in_use_1 index ce39e24e..1b239f41 100755 --- a/tests/shell/testcases/flowtable/0005delete_in_use_1 +++ b/tests/shell/testcases/flowtable/0005delete_in_use_1 @@ -3,7 +3,7 @@ set -e $NFT add table x $NFT add chain x x -$NFT add flowtable x y { hook ingress priority 0\; devices = { eth0, wlan0 }\;} +$NFT add flowtable x y { hook ingress priority 0\; devices = { lo }\;} $NFT add rule x x flow offload @y $NFT delete flowtable x y echo "E: delete flowtable in use" diff --git a/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft b/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft index 5188b207..32250699 100755 --- a/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft +++ b/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft @@ -1,7 +1,7 @@ table inet t { flowtable f { hook ingress priority 10 - devices = { eth0, wlan0 } + devices = { lo } } chain c { |