From 27f6a4c68b4fdc351890d9a675603fefc48f7353 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 24 May 2019 21:12:56 +0200 Subject: tests: replace single element sets Add at least two elements to sets. Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/nft-f/0002rollback_rule_0 | 2 +- tests/shell/testcases/nft-f/0003rollback_jump_0 | 2 +- tests/shell/testcases/nft-f/0004rollback_set_0 | 2 +- tests/shell/testcases/nft-f/0005rollback_map_0 | 2 +- tests/shell/testcases/nft-f/0006action_object_0 | 4 ++-- tests/shell/testcases/nft-f/0016redefines_1 | 4 ++-- tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft | 2 +- tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft | 2 +- tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft | 2 +- tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/shell/testcases/nft-f') diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0 index da3cdc0b..33e1212d 100755 --- a/tests/shell/testcases/nft-f/0002rollback_rule_0 +++ b/tests/shell/testcases/nft-f/0002rollback_rule_0 @@ -11,7 +11,7 @@ GOOD_RULESET="table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0 index 1238f150..294a234e 100755 --- a/tests/shell/testcases/nft-f/0003rollback_jump_0 +++ b/tests/shell/testcases/nft-f/0003rollback_jump_0 @@ -11,7 +11,7 @@ GOOD_RULESET="table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0 index 25fc870c..512840ef 100755 --- a/tests/shell/testcases/nft-f/0004rollback_set_0 +++ b/tests/shell/testcases/nft-f/0004rollback_set_0 @@ -11,7 +11,7 @@ GOOD_RULESET="table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0 index 90108e72..b1eb3dd3 100755 --- a/tests/shell/testcases/nft-f/0005rollback_map_0 +++ b/tests/shell/testcases/nft-f/0005rollback_map_0 @@ -11,7 +11,7 @@ GOOD_RULESET="table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/0006action_object_0 b/tests/shell/testcases/nft-f/0006action_object_0 index b9766f2d..ffa6c9bd 100755 --- a/tests/shell/testcases/nft-f/0006action_object_0 +++ b/tests/shell/testcases/nft-f/0006action_object_0 @@ -16,11 +16,11 @@ generate1() add set $family t s {type inet_service;} add element $family t s {8080} insert rule $family t c meta l4proto tcp tcp dport @s accept - replace rule $family t c handle 2 meta l4proto tcp tcp dport {9090} + replace rule $family t c handle 2 meta l4proto tcp tcp dport {9090, 8080} add map $family t m {type inet_service:verdict;} add element $family t m {10080:drop} insert rule $family t c meta l4proto tcp tcp dport vmap @m - add rule $family t c meta l4proto udp udp sport vmap {1111:accept} + add rule $family t c meta l4proto udp udp sport vmap {1111:accept, 2222:drop} " } diff --git a/tests/shell/testcases/nft-f/0016redefines_1 b/tests/shell/testcases/nft-f/0016redefines_1 index d0148d65..4c26b379 100755 --- a/tests/shell/testcases/nft-f/0016redefines_1 +++ b/tests/shell/testcases/nft-f/0016redefines_1 @@ -8,7 +8,7 @@ table ip x { define unused = 4.4.4.4 define address = { 1.1.1.1, 2.2.2.2 } ip saddr \$address - redefine address = { 3.3.3.3 } + redefine address = { 3.3.3.3, 4.4.4.4 } ip saddr \$address undefine unused } @@ -17,7 +17,7 @@ table ip x { EXPECTED="table ip x { chain y { ip saddr { 1.1.1.1, 2.2.2.2 } - ip saddr { 3.3.3.3 } + ip saddr { 3.3.3.3, 4.4.4.4 } } }" diff --git a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft index f6f26158..3fad9090 100644 --- a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft +++ b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft @@ -6,7 +6,7 @@ table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft index f6f26158..3fad9090 100644 --- a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft +++ b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft @@ -6,7 +6,7 @@ table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft index f6f26158..3fad9090 100644 --- a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft +++ b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft @@ -6,7 +6,7 @@ table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } diff --git a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft index f6f26158..3fad9090 100644 --- a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft +++ b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft @@ -6,7 +6,7 @@ table ip t { chain c { ct state new - tcp dport { 22222 } + tcp dport { 22222, 33333 } ip saddr @t drop jump other } -- cgit v1.2.3