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/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 +++--- 4 files changed, 9 insertions(+), 9 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 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 { -- cgit v1.2.3