tests: shell: Review test-cases for destroy command
Phil Sutter
reviewerPATCH v2 1/1 tests: shell: Review test-cases for destroy command
Having separate files for successful destroy of existing and non-existing objects is a bit too much, just combine them into one.
While being at it:
* No bashisms, using /bin/sh is fine
* Append '-e' to shebang itself instead of calling 'set'
* Use 'nft -a -e' instead of assuming the created rule's handle value
* Shellcheck warned about curly braces, quote them
---
Changes since v1:
- Non-existence already asserted via dump files
- Drop dump files left-over after removing tests
--- tests/shell/testcases/chains/0044chain_destroy_0 | 11 +++++++---- tests/shell/testcases/chains/0045chain_destroy_0 | 8 -------- .../testcases/chains/dumps/0045chain_destroy_0.nft | 2 -- tests/shell/testcases/flowtable/0015destroy_0 | 9 ++++++--- tests/shell/testcases/flowtable/0016destroy_0 | 6 ------ .../shell/testcases/flowtable/dumps/0016destroy_0.nft | 2 -- tests/shell/testcases/maps/0014destroy_0 | 10 ++++++---- tests/shell/testcases/maps/0015destroy_0 | 7 ------- tests/shell/testcases/maps/dumps/0015destroy_0.nft | 2 -- tests/shell/testcases/rule_management/0012destroy_0 | 9 +++++++-- tests/shell/testcases/rule_management/0013destroy_0 | 8 -------- .../testcases/rule_management/dumps/0013destroy_0 | 4 ---- tests/shell/testcases/sets/0072destroy_0 | 10 ++++++---- tests/shell/testcases/sets/0073destroy_0 | 7 ------- tests/shell/testcases/sets/dumps/0073destroy_0.nft | 2 -- 15 files changed, 32 insertions(+), 65 deletions(-) delete mode 100755 tests/shell/testcases/chains/0045chain_destroy_0 delete mode 100644 tests/shell/testcases/chains/dumps/0045chain_destroy_0.nft delete mode 100755 tests/shell/testcases/flowtable/0016destroy_0 delete mode 100644 tests/shell/testcases/flowtable/dumps/0016destroy_0.nft delete mode 100755 tests/shell/testcases/maps/0015destroy_0 delete mode 100644 tests/shell/testcases/maps/dumps/0015destroy_0.nft delete mode 100755 tests/shell/testcases/rule_management/0013destroy_0 delete mode 100644 tests/shell/testcases/rule_management/dumps/0013destroy_0 delete mode 100755 tests/shell/testcases/sets/0073destroy_0 delete mode 100644 tests/shell/testcases/sets/dumps/0073destroy_0.nft
tests/shell/testcases/chains/0044chain_destroy_0 +7 -4
@@ -1,7 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table t -$NFT destroy chain t nochain +# pass for non-existent chain +$NFT destroy chain t c + +# successfully delete existing chain +$NFT add chain t c +$NFT destroy chain t c
tests/shell/testcases/chains/0045chain_destroy_0 deleted +0 -8
@@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table t -$NFT add chain t c - -$NFT destroy chain t c
tests/shell/testcases/chains/dumps/0045chain_destroy_0.nft deleted +0 -2
@@ -1,2 +0,0 @@ -table ip t { -}
tests/shell/testcases/flowtable/0015destroy_0 +6 -3
@@ -1,7 +1,10 @@ -#!/bin/bash +#!/bin/sh -e -set -e $NFT add table t -$NFT add flowtable t f { hook ingress priority 10 \; devices = { lo }\; } +# pass for non-existent flowtable +$NFT destroy flowtable t f + +# successfully delete existing flowtable +$NFT add flowtable t f '{ hook ingress priority 10; devices = { lo }; }' $NFT destroy flowtable t f
tests/shell/testcases/flowtable/0016destroy_0 deleted +0 -6
@@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -$NFT add table t - -$NFT destroy flowtable t f
tests/shell/testcases/flowtable/dumps/0016destroy_0.nft deleted +0 -2
@@ -1,2 +0,0 @@ -table ip t { -}
tests/shell/testcases/maps/0014destroy_0 +6 -4
@@ -1,8 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table x -$NFT add map x y { type ipv4_addr : ipv4_addr\; } +# pass for non-existent map +$NFT destroy map x y + +# successfully delete existing map +$NFT add map x y '{ type ipv4_addr : ipv4_addr; }' $NFT destroy map x y
tests/shell/testcases/maps/0015destroy_0 deleted +0 -7
@@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table x - -$NFT destroy map x nonmap
tests/shell/testcases/maps/dumps/0015destroy_0.nft deleted +0 -2
@@ -1,2 +0,0 @@ -table ip x { -}
tests/shell/testcases/rule_management/0012destroy_0 +7 -2
@@ -1,7 +1,12 @@ -#!/bin/bash +#!/bin/sh -e -set -e $NFT add table t $NFT add chain t c +# pass for non-existent rule $NFT destroy rule t c handle 3333 + +# successfully delete existing rule +handle=$($NFT -a -e insert rule t c accept | \ + sed -n 's/.*handle \([0-9]*\)$/\1/p') +$NFT destroy rule t c handle "$handle"
tests/shell/testcases/rule_management/0013destroy_0 deleted +0 -8
@@ -1,8 +0,0 @@ -#!/bin/bash - -set -e -$NFT add table t -$NFT add chain t c -$NFT insert rule t c accept # should have handle 2 - -$NFT destroy rule t c handle 2
tests/shell/testcases/rule_management/dumps/0013destroy_0 deleted +0 -4
@@ -1,4 +0,0 @@ -table ip t { - chain c { - } -}
tests/shell/testcases/sets/0072destroy_0 +6 -4
@@ -1,8 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table x -$NFT add set x s {type ipv4_addr\; size 2\;} +# pass for non-existent set +$NFT destroy set x s + +# successfully delete existing set +$NFT add set x s '{type ipv4_addr; size 2;}' $NFT destroy set x s
tests/shell/testcases/sets/0073destroy_0 deleted +0 -7
@@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table x - -$NFT destroy set x s
tests/shell/testcases/sets/dumps/0073destroy_0.nft deleted +0 -2
@@ -1,2 +0,0 @@ -table ip x { -}
Signature · 1 line
2.40.0
Looks good to me, thank you!
Quoted 245 lines · Phil Sutter
Having separate files for successful destroy of existing and non-existing objects is a bit too much, just combine them into one.
While being at it:
* No bashisms, using
/bin/shis fine
* Append '-e' to shebang itself instead of calling 'set'
* Use 'nft -a -e' instead of assuming the created rule's handle value
* Shellcheck warned about curly braces, quote themSigned-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Non-existence already asserted via dump files
- Drop dump files left-over after removing tests--- tests/shell/testcases/chains/0044chain_destroy_0 | 11 +++++++---- tests/shell/testcases/chains/0045chain_destroy_0 | 8 -------- .../testcases/chains/dumps/0045chain_destroy_0.nft | 2 -- tests/shell/testcases/flowtable/0015destroy_0 | 9 ++++++--- tests/shell/testcases/flowtable/0016destroy_0 | 6 ------ .../shell/testcases/flowtable/dumps/0016destroy_0.nft | 2 -- tests/shell/testcases/maps/0014destroy_0 | 10 ++++++---- tests/shell/testcases/maps/0015destroy_0 | 7 ------- tests/shell/testcases/maps/dumps/0015destroy_0.nft | 2 -- tests/shell/testcases/rule_management/0012destroy_0 | 9 +++++++-- tests/shell/testcases/rule_management/0013destroy_0 | 8 -------- .../testcases/rule_management/dumps/0013destroy_0 | 4 ---- tests/shell/testcases/sets/0072destroy_0 | 10 ++++++---- tests/shell/testcases/sets/0073destroy_0 | 7 ------- tests/shell/testcases/sets/dumps/0073destroy_0.nft | 2 -- 15 files changed, 32 insertions(+), 65 deletions(-)delete mode 100755 tests/shell/testcases/chains/0045chain_destroy_0 delete mode 100644 tests/shell/testcases/chains/dumps/0045chain_destroy_0.nft delete mode 100755 tests/shell/testcases/flowtable/0016destroy_0 delete mode 100644 tests/shell/testcases/flowtable/dumps/0016destroy_0.nft delete mode 100755 tests/shell/testcases/maps/0015destroy_0 delete mode 100644 tests/shell/testcases/maps/dumps/0015destroy_0.nft delete mode 100755 tests/shell/testcases/rule_management/0013destroy_0 delete mode 100644 tests/shell/testcases/rule_management/dumps/0013destroy_0 delete mode 100755 tests/shell/testcases/sets/0073destroy_0 delete mode 100644 tests/shell/testcases/sets/dumps/0073destroy_0.nft
tests/shell/testcases/chains/0044chain_destroy_0 +7
-4@@ -1,7 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table t -$NFT destroy chain t nochain +# pass for non-existent chain +$NFT destroy chain t c + +# successfully delete existing chain +$NFT add chain t c +$NFT destroy chain t ctests/shell/testcases/chains/0045chain_destroy_0 deleted +0
-8@@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table t -$NFT add chain t c - -$NFT destroy chain t ctests/shell/testcases/chains/dumps/0045chain_destroy_0.nft deleted +0
-2@@ -1,2 +0,0 @@ -table ip t { -}tests/shell/testcases/flowtable/0015destroy_0 +6
-3@@ -1,7 +1,10 @@ -#!/bin/bash +#!/bin/sh -e -set -e $NFT add table t -$NFT add flowtable t f { hook ingress priority 10 \; devices = { lo }\; } +# pass for non-existent flowtable +$NFT destroy flowtable t f + +# successfully delete existing flowtable +$NFT add flowtable t f '{ hook ingress priority 10; devices = { lo }; }' $NFT destroy flowtable t ftests/shell/testcases/flowtable/0016destroy_0 deleted +0
-6@@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -$NFT add table t - -$NFT destroy flowtable t ftests/shell/testcases/flowtable/dumps/0016destroy_0.nft deleted +0
-2@@ -1,2 +0,0 @@ -table ip t { -}tests/shell/testcases/maps/0014destroy_0 +6
-4@@ -1,8 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table x -$NFT add map x y { type ipv4_addr : ipv4_addr\; } +# pass for non-existent map +$NFT destroy map x y + +# successfully delete existing map +$NFT add map x y '{ type ipv4_addr : ipv4_addr; }' $NFT destroy map x ytests/shell/testcases/maps/0015destroy_0 deleted +0
-7@@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table x - -$NFT destroy map x nonmaptests/shell/testcases/maps/dumps/0015destroy_0.nft deleted +0
-2@@ -1,2 +0,0 @@ -table ip x { -}tests/shell/testcases/rule_management/0012destroy_0 +7
-2@@ -1,7 +1,12 @@ -#!/bin/bash +#!/bin/sh -e -set -e $NFT add table t $NFT add chain t c +# pass for non-existent rule $NFT destroy rule t c handle 3333 + +# successfully delete existing rule +handle=$($NFT -a -e insert rule t c accept | \ + sed -n 's/.*handle \([0-9]*\)$/\1/p') +$NFT destroy rule t c handle "$handle"tests/shell/testcases/rule_management/0013destroy_0 deleted +0
-8@@ -1,8 +0,0 @@ -#!/bin/bash - -set -e -$NFT add table t -$NFT add chain t c -$NFT insert rule t c accept # should have handle 2 - -$NFT destroy rule t c handle 2tests/shell/testcases/rule_management/dumps/0013destroy_0 deleted +0
-4@@ -1,4 +0,0 @@ -table ip t { - chain c { - } -}tests/shell/testcases/sets/0072destroy_0 +6
-4@@ -1,8 +1,10 @@ -#!/bin/bash - -set -e +#!/bin/sh -e $NFT add table x -$NFT add set x s {type ipv4_addr\; size 2\;} +# pass for non-existent set +$NFT destroy set x s + +# successfully delete existing set +$NFT add set x s '{type ipv4_addr; size 2;}' $NFT destroy set x stests/shell/testcases/sets/0073destroy_0 deleted +0
-7@@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table x - -$NFT destroy set x stests/shell/testcases/sets/dumps/0073destroy_0.nft deleted +0
-2@@ -1,2 +0,0 @@ -table ip x { -}
Phil Sutter
reviewerQuoted 1 line · Fernando F. Mancera
Looks good to me, thank you!
Patch applied, thanks for your review!