diff options
| -rw-r--r-- | tests/shell/testcases/chains/dumps/netdev_chain_0.nft | 3 | ||||
| -rwxr-xr-x | tests/shell/testcases/chains/netdev_chain_0 | 26 | ||||
| -rwxr-xr-x | tests/shell/testcases/flowtable/0012flowtable_variable_0 | 6 | ||||
| -rw-r--r-- | tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft | 4 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/netdev | 12 | ||||
| -rwxr-xr-x | tests/shell/testcases/listing/0020flowtable_0 | 12 |
6 files changed, 32 insertions, 31 deletions
diff --git a/tests/shell/testcases/chains/dumps/netdev_chain_0.nft b/tests/shell/testcases/chains/dumps/netdev_chain_0.nft index bc02dc18..aa571e00 100644 --- a/tests/shell/testcases/chains/dumps/netdev_chain_0.nft +++ b/tests/shell/testcases/chains/dumps/netdev_chain_0.nft @@ -1,5 +1,2 @@ table netdev x { - chain y { - type filter hook ingress devices = { d0, d1 } priority filter; policy accept; - } } diff --git a/tests/shell/testcases/chains/netdev_chain_0 b/tests/shell/testcases/chains/netdev_chain_0 index 41e72441..88bbc437 100755 --- a/tests/shell/testcases/chains/netdev_chain_0 +++ b/tests/shell/testcases/chains/netdev_chain_0 @@ -1,24 +1,18 @@ #!/bin/bash -ip link add d0 type dummy || { - echo "Skipping, no dummy interface available" - exit 77 -} -trap "ip link del d0" EXIT - -ip link add d1 type dummy || { - echo "Skipping, no dummy interface available" - exit 77 -} -trap "ip link del d1" EXIT +set -e -ip link add d2 type dummy || { - echo "Skipping, no dummy interface available" - exit 77 +iface_cleanup() { + ip link del d0 &>/dev/null || : + ip link del d1 &>/dev/null || : + ip link del d2 &>/dev/null || : } -trap "ip link del d2" EXIT +trap 'iface_cleanup' EXIT +iface_cleanup -set -e +ip link add d0 type dummy +ip link add d1 type dummy +ip link add d2 type dummy RULESET="table netdev x { chain y { diff --git a/tests/shell/testcases/flowtable/0012flowtable_variable_0 b/tests/shell/testcases/flowtable/0012flowtable_variable_0 index 8e334224..080059d2 100755 --- a/tests/shell/testcases/flowtable/0012flowtable_variable_0 +++ b/tests/shell/testcases/flowtable/0012flowtable_variable_0 @@ -2,6 +2,12 @@ set -e +iface_cleanup() { + ip link del dummy1 &>/dev/null || : +} +trap 'iface_cleanup' EXIT +iface_cleanup + ip link add name dummy1 type dummy EXPECTED="define if_main = { lo, dummy1 } diff --git a/tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft b/tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft index 1cbb2f11..df1c51a2 100644 --- a/tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft +++ b/tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft @@ -1,14 +1,14 @@ table ip filter1 { flowtable Main_ft1 { hook ingress priority filter - devices = { dummy1, lo } + devices = { lo } counter } } table ip filter2 { flowtable Main_ft2 { hook ingress priority filter - devices = { dummy1, lo } + devices = { lo } counter } } diff --git a/tests/shell/testcases/json/netdev b/tests/shell/testcases/json/netdev index dad7afcd..8c16cf42 100755 --- a/tests/shell/testcases/json/netdev +++ b/tests/shell/testcases/json/netdev @@ -1,12 +1,14 @@ #!/bin/bash -ip link add d0 type dummy || { - echo "Skipping, no dummy interface available" - exit 77 +set -e + +iface_cleanup() { + ip link del d0 &>/dev/null || : } -trap "ip link del d0" EXIT +trap 'iface_cleanup' EXIT +iface_cleanup -set -e +ip link add d0 type dummy $NFT flush ruleset $NFT add table inet test diff --git a/tests/shell/testcases/listing/0020flowtable_0 b/tests/shell/testcases/listing/0020flowtable_0 index 210289d7..6eb82cfe 100755 --- a/tests/shell/testcases/listing/0020flowtable_0 +++ b/tests/shell/testcases/listing/0020flowtable_0 @@ -2,6 +2,8 @@ # list only the flowtable asked for with table +set -e + FLOWTABLES="flowtable f { hook ingress priority filter devices = { lo } @@ -41,13 +43,13 @@ EXPECTED3="table ip filter { } }" -ip link add d0 type dummy || { - echo "Skipping, no dummy interface available" - exit 77 +iface_cleanup() { + ip link del d0 &>/dev/null || : } -trap "ip link del d0" EXIT +trap 'iface_cleanup' EXIT +iface_cleanup -set -e +ip link add d0 type dummy $NFT -f - <<< "$RULESET" |