Skip to contentSkip to conversation

tests: shell: Review test-cases for destroy command

PATCH In review Phil Sutter 2 participants 3 messages Aug 3, 2023 netfilter

lore
Share & tools
lore

Phil Sutter

author reviewer
#0 lore raw

PATCH 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
index 070021cf12f24..8384da66a5b0d 100755
@@ -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
deleted file mode 100755
index b356f8f885ca4..0000000000000
@@ -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
deleted file mode 100644
index 985768baf3a1f..0000000000000
@@ -1,2 +0,0 @@
-table ip t {
-}
tests/shell/testcases/flowtable/0015destroy_0 +6 -3
index 4828d8187018c..66fce4992a502 100755
@@ -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
deleted file mode 100755
index ce23c753365af..0000000000000
@@ -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
deleted file mode 100644
index 985768baf3a1f..0000000000000
@@ -1,2 +0,0 @@
-table ip t {
-}
tests/shell/testcases/maps/0014destroy_0 +6 -4
index b769276d52599..14c3f78af7f19 100755
@@ -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
deleted file mode 100755
index abad4d57e7221..0000000000000
@@ -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
deleted file mode 100644
index 5d4d2cafb577d..0000000000000
@@ -1,2 +0,0 @@
-table ip x {
-}
tests/shell/testcases/rule_management/0012destroy_0 +7 -2
index 1b61155e9b7ef..85f9c9f6d4c78 100755
@@ -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
deleted file mode 100755
index 895c24a4dacba..0000000000000
@@ -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
deleted file mode 100644
index 1e0d1d603739b..0000000000000
@@ -1,4 +0,0 @@
-table ip t {
-	chain c {
-	}
-}
tests/shell/testcases/sets/0072destroy_0 +6 -4
index c9cf9ff716349..fd1d645057c09 100755
@@ -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
deleted file mode 100755
index a9d65a5541c53..0000000000000
@@ -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
deleted file mode 100644
index 5d4d2cafb577d..0000000000000
@@ -1,2 +0,0 @@
-table ip x {
-}
Signature · 1 line
2.40.0
#1 lore raw

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/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
index 070021cf12f24..8384da66a5b0d 100755
@@ -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
deleted file mode 100755
index b356f8f885ca4..0000000000000
@@ -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
deleted file mode 100644
index 985768baf3a1f..0000000000000
@@ -1,2 +0,0 @@
-table ip t {
-}
tests/shell/testcases/flowtable/0015destroy_0 +6 -3
index 4828d8187018c..66fce4992a502 100755
@@ -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
deleted file mode 100755
index ce23c753365af..0000000000000
@@ -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
deleted file mode 100644
index 985768baf3a1f..0000000000000
@@ -1,2 +0,0 @@
-table ip t {
-}
tests/shell/testcases/maps/0014destroy_0 +6 -4
index b769276d52599..14c3f78af7f19 100755
@@ -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
deleted file mode 100755
index abad4d57e7221..0000000000000
@@ -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
deleted file mode 100644
index 5d4d2cafb577d..0000000000000
@@ -1,2 +0,0 @@
-table ip x {
-}
tests/shell/testcases/rule_management/0012destroy_0 +7 -2
index 1b61155e9b7ef..85f9c9f6d4c78 100755
@@ -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
deleted file mode 100755
index 895c24a4dacba..0000000000000
@@ -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
deleted file mode 100644
index 1e0d1d603739b..0000000000000
@@ -1,4 +0,0 @@
-table ip t {
-	chain c {
-	}
-}
tests/shell/testcases/sets/0072destroy_0 +6 -4
index c9cf9ff716349..fd1d645057c09 100755
@@ -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
deleted file mode 100755
index a9d65a5541c53..0000000000000
@@ -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
deleted file mode 100644
index 5d4d2cafb577d..0000000000000
@@ -1,2 +0,0 @@
-table ip x {
-}
author reviewer
#2 lore raw
Quoted 1 line · Fernando F. Mancera

Looks good to me, thank you!

Patch applied, thanks for your review!