From 535a7324626f45bded749dcee7e225f9e0fa28d0 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 22 Mar 2017 01:26:36 +0100 Subject: sets: Fix for missing space after last element Not having a space between the last element in a set and the closing curly brace looks ugly, so add it here. This also adjusts all shell testcases as they match whitespace in nft output and therefore fail otherwise. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/maps/0003map_add_many_elements_0 | 2 +- tests/shell/testcases/maps/0004interval_map_create_once_0 | 2 +- .../testcases/maps/0005interval_map_add_many_elements_0 | 2 +- tests/shell/testcases/maps/0006interval_map_overlap_0 | 2 +- tests/shell/testcases/netns/0001nft-f_0 | 12 ++++++------ tests/shell/testcases/netns/0002loosecommands_0 | 4 ++-- tests/shell/testcases/netns/0003many_0 | 12 ++++++------ tests/shell/testcases/nft-f/0002rollback_rule_0 | 4 ++-- tests/shell/testcases/nft-f/0003rollback_jump_0 | 4 ++-- tests/shell/testcases/nft-f/0004rollback_set_0 | 4 ++-- tests/shell/testcases/nft-f/0005rollback_map_0 | 6 +++--- tests/shell/testcases/sets/0021nesting_0 | 2 +- tests/shell/testcases/transactions/0035set_0 | 2 +- tests/shell/testcases/transactions/0038set_0 | 2 +- tests/shell/testcases/transactions/0039set_0 | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) (limited to 'tests') diff --git a/tests/shell/testcases/maps/0003map_add_many_elements_0 b/tests/shell/testcases/maps/0003map_add_many_elements_0 index a2233e39..36b1be25 100755 --- a/tests/shell/testcases/maps/0003map_add_many_elements_0 +++ b/tests/shell/testcases/maps/0003map_add_many_elements_0 @@ -49,7 +49,7 @@ $NFT -f $tmpfile EXPECTED="table ip x { map y { type ipv4_addr : ipv4_addr - elements = { $(generate_test)} + elements = { $(generate_test) } } }" GET=$($NFT list ruleset) diff --git a/tests/shell/testcases/maps/0004interval_map_create_once_0 b/tests/shell/testcases/maps/0004interval_map_create_once_0 index 7d4877eb..1f043875 100755 --- a/tests/shell/testcases/maps/0004interval_map_create_once_0 +++ b/tests/shell/testcases/maps/0004interval_map_create_once_0 @@ -48,7 +48,7 @@ EXPECTED="table ip x { map y { type ipv4_addr : ipv4_addr flags interval - elements = { $(generate_test)} + elements = { $(generate_test) } } }" GET=$($NFT list ruleset) diff --git a/tests/shell/testcases/maps/0005interval_map_add_many_elements_0 b/tests/shell/testcases/maps/0005interval_map_add_many_elements_0 index 824f2c85..4d4f708e 100755 --- a/tests/shell/testcases/maps/0005interval_map_add_many_elements_0 +++ b/tests/shell/testcases/maps/0005interval_map_add_many_elements_0 @@ -54,7 +54,7 @@ EXPECTED="table ip x { map y { type ipv4_addr : ipv4_addr flags interval - elements = { $(generate_test)} + elements = { $(generate_test) } } }" GET=$($NFT list ruleset) diff --git a/tests/shell/testcases/maps/0006interval_map_overlap_0 b/tests/shell/testcases/maps/0006interval_map_overlap_0 index c1bf3de1..8597639e 100755 --- a/tests/shell/testcases/maps/0006interval_map_overlap_0 +++ b/tests/shell/testcases/maps/0006interval_map_overlap_0 @@ -29,7 +29,7 @@ EXPECTED="table ip x { map y { type ipv4_addr : ipv4_addr flags interval - elements = { 10.0.1.0/24 : 10.0.0.1, 10.0.2.0/24 : 10.0.0.2} + elements = { 10.0.1.0/24 : 10.0.0.1, 10.0.2.0/24 : 10.0.0.2 } } }" GET=$($NFT list ruleset) diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0 index 663167d7..43527523 100755 --- a/tests/shell/testcases/netns/0001nft-f_0 +++ b/tests/shell/testcases/netns/0001nft-f_0 @@ -19,12 +19,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted RULESET="table ip t { set s { type ipv4_addr - elements = { 1.1.0.0} + elements = { 1.1.0.0 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip saddr @s drop jump other } @@ -35,12 +35,12 @@ RULESET="table ip t { table ip6 t { set s { type ipv6_addr - elements = { fe00::1} + elements = { fe00::1 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip6 saddr @s drop jump other } @@ -51,12 +51,12 @@ table ip6 t { table inet t { set s { type ipv6_addr - elements = { fe00::1} + elements = { fe00::1 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip6 saddr @s drop jump other } diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0 index fbaa3865..3910446a 100755 --- a/tests/shell/testcases/netns/0002loosecommands_0 +++ b/tests/shell/testcases/netns/0002loosecommands_0 @@ -39,12 +39,12 @@ netns_exec $NETNS_NAME "$NFT add rule ip t c jump other" RULESET="table ip t { set s { type ipv4_addr - elements = { 1.1.0.0} + elements = { 1.1.0.0 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip saddr @s drop jump other } diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0 index 17d7b935..03da6eec 100755 --- a/tests/shell/testcases/netns/0003many_0 +++ b/tests/shell/testcases/netns/0003many_0 @@ -22,12 +22,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted RULESET="table ip t { set s { type ipv4_addr - elements = { 1.1.0.0} + elements = { 1.1.0.0 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip saddr @s drop jump other } @@ -38,12 +38,12 @@ RULESET="table ip t { table ip6 t { set s { type ipv6_addr - elements = { fe00::1} + elements = { fe00::1 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip6 saddr @s drop jump other } @@ -54,12 +54,12 @@ table ip6 t { table inet t { set s { type ipv6_addr - elements = { fe00::1} + elements = { fe00::1 } } chain c { ct state new - udp dport { 12345} + udp dport { 12345 } ip6 saddr @s drop jump other } diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0 index 5518c0b2..ddeb5423 100755 --- a/tests/shell/testcases/nft-f/0002rollback_rule_0 +++ b/tests/shell/testcases/nft-f/0002rollback_rule_0 @@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted GOOD_RULESET="table ip t { set t { type ipv4_addr - elements = { 1.1.1.1} + elements = { 1.1.1.1 } } chain c { ct state new - tcp dport { 22222} + tcp dport { 22222 } 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 5c8c6852..6c43df9d 100755 --- a/tests/shell/testcases/nft-f/0003rollback_jump_0 +++ b/tests/shell/testcases/nft-f/0003rollback_jump_0 @@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted GOOD_RULESET="table ip t { set t { type ipv4_addr - elements = { 1.1.1.1} + elements = { 1.1.1.1 } } chain c { ct state new - tcp dport { 22222} + tcp dport { 22222 } 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 db1c84cb..1dea85ec 100755 --- a/tests/shell/testcases/nft-f/0004rollback_set_0 +++ b/tests/shell/testcases/nft-f/0004rollback_set_0 @@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted GOOD_RULESET="table ip t { set t { type ipv4_addr - elements = { 1.1.1.1} + elements = { 1.1.1.1 } } chain c { ct state new - tcp dport { 22222} + tcp dport { 22222 } 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 13bb9075..777cc717 100755 --- a/tests/shell/testcases/nft-f/0005rollback_map_0 +++ b/tests/shell/testcases/nft-f/0005rollback_map_0 @@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted GOOD_RULESET="table ip t { set t { type ipv4_addr - elements = { 1.1.1.1} + elements = { 1.1.1.1 } } chain c { ct state new - tcp dport { 22222} + tcp dport { 22222 } ip saddr @t drop jump other } @@ -31,7 +31,7 @@ GOOD_RULESET="table ip t { BAD_RULESET="flush ruleset table ip t2 { chain c2 { - tcp dport map {22222: jump other, 11111: jump invalid} + tcp dport map { 22222: jump other, 11111: jump invalid } } chain other { diff --git a/tests/shell/testcases/sets/0021nesting_0 b/tests/shell/testcases/sets/0021nesting_0 index 3bcb6147..763d9ae1 100755 --- a/tests/shell/testcases/sets/0021nesting_0 +++ b/tests/shell/testcases/sets/0021nesting_0 @@ -33,7 +33,7 @@ fi EXPECTED="table ip x { chain y { - ip saddr { 1.1.1.0/24, 2.2.2.0/24, 3.3.3.0/24} + ip saddr { 1.1.1.0/24, 2.2.2.0/24, 3.3.3.0/24 } } }" diff --git a/tests/shell/testcases/transactions/0035set_0 b/tests/shell/testcases/transactions/0035set_0 index a014a69e..0788e2fe 100755 --- a/tests/shell/testcases/transactions/0035set_0 +++ b/tests/shell/testcases/transactions/0035set_0 @@ -27,7 +27,7 @@ fi EXPECTED="table ip x { set y { type ipv4_addr - elements = { 3.3.3.3} + elements = { 3.3.3.3 } } }" diff --git a/tests/shell/testcases/transactions/0038set_0 b/tests/shell/testcases/transactions/0038set_0 index 2e36fa31..76550755 100755 --- a/tests/shell/testcases/transactions/0038set_0 +++ b/tests/shell/testcases/transactions/0038set_0 @@ -28,7 +28,7 @@ EXPECTED="table ip x { set y { type ipv4_addr flags interval - elements = { 192.168.4.0/24} + elements = { 192.168.4.0/24 } } }" diff --git a/tests/shell/testcases/transactions/0039set_0 b/tests/shell/testcases/transactions/0039set_0 index 2e36fa31..76550755 100755 --- a/tests/shell/testcases/transactions/0039set_0 +++ b/tests/shell/testcases/transactions/0039set_0 @@ -28,7 +28,7 @@ EXPECTED="table ip x { set y { type ipv4_addr flags interval - elements = { 192.168.4.0/24} + elements = { 192.168.4.0/24 } } }" -- cgit v1.2.3