summaryrefslogtreecommitdiffstats
path: root/tests/shell
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2024-08-08 12:25:32 +0200
committerFlorian Westphal <fw@strlen.de>2024-08-08 12:31:24 +0200
commit273411f5326f54a09133663d61dc4903ed56193a (patch)
tree9f09bf468d5a7ae5056796b9bd72553784c6eaaa /tests/shell
parent156b5936b3b7a0b1ee590a02874beaba5235f758 (diff)
tests: shell: resolve check-tree.sh errors
It prints a few errors like this: ERR: "tests/shell/testcases/chains/jump_to_base_chain" has no "tests/shell/testcases/chains/dumps/jump_to_base_chain.{nft,nodump}" file For all of those, add the relevant .nft dump file. Add a 'nodump' file in case the test doesn't print anything (e.g. because the test checks that invalid ruleset fails validation). Some tests have a .nft but not .json-nft, this is because json lacks some features, in particular "typeof" and anonymous/implicit chains. ERR: "tests/shell/testcases/maps/delete_element_catchall" has no "tests/shell/testcases/maps/dumps/delete_element_catchall.{nft,nodump}" file ERR: "tests/shell/testcases/maps/dumps/delete_elem_catchall.nft" has no test "tests/shell/testcases/maps/delete_elem_catchall" these two are related, rename the dump file to match the script name. Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell')
-rw-r--r--tests/shell/testcases/chains/dumps/jump_to_base_chain.nodump0
-rw-r--r--tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.json-nft32
-rw-r--r--tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.nft7
-rw-r--r--tests/shell/testcases/maps/dumps/0024named_objects_2.nodump0
-rw-r--r--tests/shell/testcases/maps/dumps/anonymous_snat_map_2.nodump0
-rw-r--r--tests/shell/testcases/maps/dumps/delete_element_catchall.nft (renamed from tests/shell/testcases/maps/dumps/delete_elem_catchall.nft)0
-rw-r--r--tests/shell/testcases/packetpath/dumps/flowtables.nodump0
-rw-r--r--tests/shell/testcases/packetpath/dumps/vlan_mangling.nodump0
-rw-r--r--tests/shell/testcases/packetpath/dumps/vlan_qinq.nodump0
-rw-r--r--tests/shell/testcases/transactions/dumps/handle_bad_family.json-nft18
-rw-r--r--tests/shell/testcases/transactions/dumps/handle_bad_family.nft2
11 files changed, 59 insertions, 0 deletions
diff --git a/tests/shell/testcases/chains/dumps/jump_to_base_chain.nodump b/tests/shell/testcases/chains/dumps/jump_to_base_chain.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/chains/dumps/jump_to_base_chain.nodump
diff --git a/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.json-nft b/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.json-nft
new file mode 100644
index 00000000..9151d42f
--- /dev/null
+++ b/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.json-nft
@@ -0,0 +1,32 @@
+{
+ "nftables": [
+ {
+ "metainfo": {
+ "version": "VERSION",
+ "release_name": "RELEASE_NAME",
+ "json_schema_version": 1
+ }
+ },
+ {
+ "table": {
+ "family": "netdev",
+ "name": "test",
+ "handle": 0,
+ "flags": "dormant"
+ }
+ },
+ {
+ "chain": {
+ "family": "netdev",
+ "table": "test",
+ "name": "ingress",
+ "handle": 0,
+ "dev": "dummy1",
+ "type": "filter",
+ "hook": "ingress",
+ "prio": 0,
+ "policy": "drop"
+ }
+ }
+ ]
+}
diff --git a/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.nft b/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.nft
new file mode 100644
index 00000000..aad7cb63
--- /dev/null
+++ b/tests/shell/testcases/chains/dumps/netdev_chain_dormant_autoremove.nft
@@ -0,0 +1,7 @@
+table netdev test {
+ flags dormant
+
+ chain ingress {
+ type filter hook ingress device "dummy1" priority filter; policy drop;
+ }
+}
diff --git a/tests/shell/testcases/maps/dumps/0024named_objects_2.nodump b/tests/shell/testcases/maps/dumps/0024named_objects_2.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/maps/dumps/0024named_objects_2.nodump
diff --git a/tests/shell/testcases/maps/dumps/anonymous_snat_map_2.nodump b/tests/shell/testcases/maps/dumps/anonymous_snat_map_2.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/maps/dumps/anonymous_snat_map_2.nodump
diff --git a/tests/shell/testcases/maps/dumps/delete_elem_catchall.nft b/tests/shell/testcases/maps/dumps/delete_element_catchall.nft
index 14054f4d..14054f4d 100644
--- a/tests/shell/testcases/maps/dumps/delete_elem_catchall.nft
+++ b/tests/shell/testcases/maps/dumps/delete_element_catchall.nft
diff --git a/tests/shell/testcases/packetpath/dumps/flowtables.nodump b/tests/shell/testcases/packetpath/dumps/flowtables.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/packetpath/dumps/flowtables.nodump
diff --git a/tests/shell/testcases/packetpath/dumps/vlan_mangling.nodump b/tests/shell/testcases/packetpath/dumps/vlan_mangling.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/packetpath/dumps/vlan_mangling.nodump
diff --git a/tests/shell/testcases/packetpath/dumps/vlan_qinq.nodump b/tests/shell/testcases/packetpath/dumps/vlan_qinq.nodump
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/shell/testcases/packetpath/dumps/vlan_qinq.nodump
diff --git a/tests/shell/testcases/transactions/dumps/handle_bad_family.json-nft b/tests/shell/testcases/transactions/dumps/handle_bad_family.json-nft
new file mode 100644
index 00000000..15ec0aac
--- /dev/null
+++ b/tests/shell/testcases/transactions/dumps/handle_bad_family.json-nft
@@ -0,0 +1,18 @@
+{
+ "nftables": [
+ {
+ "metainfo": {
+ "version": "VERSION",
+ "release_name": "RELEASE_NAME",
+ "json_schema_version": 1
+ }
+ },
+ {
+ "table": {
+ "family": "ip",
+ "name": "x",
+ "handle": 0
+ }
+ }
+ ]
+}
diff --git a/tests/shell/testcases/transactions/dumps/handle_bad_family.nft b/tests/shell/testcases/transactions/dumps/handle_bad_family.nft
new file mode 100644
index 00000000..5d4d2caf
--- /dev/null
+++ b/tests/shell/testcases/transactions/dumps/handle_bad_family.nft
@@ -0,0 +1,2 @@
+table ip x {
+}