From 1504fc484e2984e4d9994a16b6a2eb293a133de6 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 23 Nov 2014 22:05:12 +0100 Subject: tests: regression: fix bogus error due to bash This suppresses several superfluous errors: any/meta.t: ERROR: line 168: nft add rule ip test-ip4 input meta iifgroup {11,33}: This rule should not have failed. any/meta.t: ERROR: line 178: nft add rule ip test-ip4 input meta oifgroup {11,33}: This rule should not have failed. ip/masquerade.t: ERROR: line 23: nft add rule ip4 test-ip4 output tcp dport {1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade: This rule should not have failed. ip6/masquerade.t: ERROR: line 23: nft add rule ip6 test-ip6 output tcp dport {1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade: This rule should not have failed. This needs a space before the list of elements in the set, otherwise bash here misinterprets the set. Signed-off-by: Pablo Neira Ayuso --- tests/regression/any/meta.t | 4 ++-- tests/regression/ip/masquerade.t | 2 +- tests/regression/ip6/masquerade.t | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/regression/any/meta.t b/tests/regression/any/meta.t index ba6756dc..b3f91c92 100644 --- a/tests/regression/any/meta.t +++ b/tests/regression/any/meta.t @@ -165,7 +165,7 @@ meta iifgroup default;ok;iifgroup default meta iifgroup != default;ok;iifgroup != default meta iifgroup {default};ok;;iifgroup {default} - meta iifgroup != {default};ok -meta iifgroup {11,33};ok;oifgroup {11,33} +meta iifgroup { 11,33};ok meta iifgroup {11-33};ok - meta iifgroup != {11,33};ok - meta iifgroup != {11-33};ok @@ -175,7 +175,7 @@ meta oifgroup default;ok;oifgroup default meta oifgroup != default;ok;oifgroup != default meta oifgroup {default};ok;oifgroup {default} - meta oifgroup != {default};ok -meta oifgroup {11,33};ok;oifgroup {11,33} +meta oifgroup { 11,33};ok meta oifgroup {11-33};ok - meta oifgroup != {11,33};ok - meta oifgroup != {11-33};ok diff --git a/tests/regression/ip/masquerade.t b/tests/regression/ip/masquerade.t index c2840b0b..3c952c09 100644 --- a/tests/regression/ip/masquerade.t +++ b/tests/regression/ip/masquerade.t @@ -20,6 +20,6 @@ tcp sport 22 masquerade accept;fail ip saddr 10.1.1.1 masquerade drop;fail # masquerade with sets -tcp dport {1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok +tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade;ok;ip daddr >= 10.0.0.0 ip daddr <= 10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok diff --git a/tests/regression/ip6/masquerade.t b/tests/regression/ip6/masquerade.t index c0f8b87d..175b318c 100644 --- a/tests/regression/ip6/masquerade.t +++ b/tests/regression/ip6/masquerade.t @@ -20,6 +20,6 @@ tcp sport 22 masquerade accept;fail ip6 saddr ::1 masquerade drop;fail # masquerade with sets -tcp dport {1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok +tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 masquerade;ok;ip6 daddr >= fe00::1 ip6 daddr <= fe00::200 udp dport 53 counter packets 0 bytes 0 masquerade iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok -- cgit v1.2.3