tests: py: Use stateless option on tests
PATCH 2/2 tests: py: Use stateless option on tests
To don't trigger false errors because of unrelated traffic on the tested machine.
Tests, which have rules with counter and 'ok' result, are updated to avoid new Warnings.
Signed-off-by Elise Lennion <[email protected]>
--- tests/py/ip/flowtable.t | 2 +- tests/py/ip/flowtable.t.payload | 2 +- tests/py/ip/masquerade.t | 2 +- tests/py/ip/masquerade.t.payload | 2 +- tests/py/ip/redirect.t | 2 +- tests/py/ip/redirect.t.payload | 2 +- tests/py/ip6/flowtable.t | 4 ++-- tests/py/ip6/masquerade.t | 2 +- tests/py/ip6/masquerade.t.payload.ip6 | 2 +- tests/py/ip6/redirect.t | 4 ++-- tests/py/ip6/redirect.t.payload.ip6 | 4 ++-- tests/py/nft-test.py | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
tests/py/ip/flowtable.t +1 -1
@@ -2,4 +2,4 @@ *ip;test-ip;input -flow table xyz { ip saddr timeout 30s counter packets 0 bytes 0};ok +flow table xyz { ip saddr timeout 30s counter};ok
tests/py/ip/flowtable.t.payload +1 -1
@@ -1,4 +1,4 @@ -# flow table xyz { ip saddr timeout 30s counter packets 0 bytes 0} +# flow table xyz { ip saddr timeout 30s counter} xyz test-ip 31 xyz test-ip 0 ip test-ip input
tests/py/ip/masquerade.t +1 -1
@@ -26,5 +26,5 @@ 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 -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-10.2.3.4 udp dport 53 counter masquerade;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok
tests/py/ip/masquerade.t.payload +1 -1
@@ -97,7 +97,7 @@ ip test-ip4 postrouting [ lookup reg 1 set __set%d ] [ masq ] -# ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade +# ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter masquerade ip test-ip4 postrouting [ payload load 4b @ network header + 16 => reg 1 ] [ cmp gte reg 1 0x0000000a ]
tests/py/ip/redirect.t +1 -1
@@ -43,7 +43,7 @@ ip saddr 10.1.1.1 redirect drop;fail # redirect with sets tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect;ok -ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 redirect;ok +ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter redirect;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect;ok # redirect with maps
tests/py/ip/redirect.t.payload +1 -1
@@ -179,7 +179,7 @@ ip test-ip4 output [ lookup reg 1 set __set%d ] [ redir ] -# ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 redirect +# ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter redirect ip test-ip4 output [ payload load 4b @ network header + 16 => reg 1 ] [ cmp gte reg 1 0x0000000a ]
tests/py/ip6/flowtable.t +2 -2
@@ -2,5 +2,5 @@ *ip6;test-ip6;input -flow table acct_out { meta iif . ip6 saddr timeout 600s counter };ok;flow table acct_out { iif . ip6 saddr timeout 10m counter packets 0 bytes 0} -flow table acct_out { ip6 saddr . meta iif timeout 600s counter };ok;flow table acct_out { ip6 saddr . iif timeout 10m counter packets 0 bytes 0} +flow table acct_out { meta iif . ip6 saddr timeout 600s counter };ok;flow table acct_out { iif . ip6 saddr timeout 10m counter} +flow table acct_out { ip6 saddr . meta iif timeout 600s counter };ok;flow table acct_out { ip6 saddr . iif timeout 10m counter}
tests/py/ip6/masquerade.t +1 -1
@@ -26,5 +26,5 @@ 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 -ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 masquerade;ok +ip6 daddr fe00::1-fe00::200 udp dport 53 counter masquerade;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok
tests/py/ip6/masquerade.t.payload.ip6 +1 -1
@@ -97,7 +97,7 @@ ip6 test-ip6 postrouting [ lookup reg 1 set __set%d ] [ masq ] -# ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 masquerade +# ip6 daddr fe00::1-fe00::200 udp dport 53 counter masquerade ip6 test-ip6 postrouting [ payload load 16b @ network header + 24 => reg 1 ] [ cmp gte reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 ]
tests/py/ip6/redirect.t +2 -2
@@ -5,7 +5,7 @@ # with no arguments redirect;ok udp dport 954 redirect;ok -ip6 saddr fe00::cafe counter packets 0 bytes 0 redirect;ok +ip6 saddr fe00::cafe counter redirect;ok # nf_nat flags combination udp dport 53 redirect random;ok
@@ -42,7 +42,7 @@ ip6 saddr ::1 redirect drop;fail # redirect with sets tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect;ok -ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 redirect;ok +ip6 daddr fe00::1-fe00::200 udp dport 53 counter redirect;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect;ok # redirect with maps
tests/py/ip6/redirect.t.payload.ip6 +2 -2
@@ -10,7 +10,7 @@ ip6 test-ip6 output [ cmp eq reg 1 0x0000ba03 ] [ redir ] -# ip6 saddr fe00::cafe counter packets 0 bytes 0 redirect +# ip6 saddr fe00::cafe counter redirect ip6 test-ip6 output [ payload load 16b @ network header + 8 => reg 1 ] [ cmp eq reg 1 0x000000fe 0x00000000 0x00000000 0xfeca0000 ]
@@ -163,7 +163,7 @@ ip6 test-ip6 output [ lookup reg 1 set __set%d ] [ redir ] -# ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 redirect +# ip6 daddr fe00::1-fe00::200 udp dport 53 counter redirect ip6 test-ip6 output [ payload load 16b @ network header + 24 => reg 1 ] [ cmp gte reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 ]
tests/py/nft-test.py +1 -1
@@ -625,7 +625,7 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path): gotf.name, 1) # Check output of nft - process = subprocess.Popen([NFT_BIN, '-nnn', 'list', 'table', + process = subprocess.Popen([NFT_BIN, '-nnns', 'list', 'table', table.family, table.name], shell=False, stdout=subprocess.PIPE,
Signature · 1 line
2.7.4
Pablo Neira Ayuso
maintainerQuoted 5 lines · Elise Lennion
To don't trigger false errors because of unrelated traffic on the tested machine.
Tests, which have rules with counter and 'ok' result, are updated to avoid new Warnings.
Also applied, thanks.
tests/py/ip/flowtable.t line 5
Quoted 10 lines
tests/py/ip/flowtable.t +1
-1@@ -2,4 +2,4 @@ *ip;test-ip;input -flow table xyz { ip saddr timeout 30s counter packets 0 bytes 0};ok +flow table xyz { ip saddr timeout 30s counter};ok
This reminds something: From flow tables, counter, quota, and limit must always be printed in their stateless version.
A simple way to fix this is to turn stateless_output into unsigned int, so you can stateless_output++ before printing the statement from flow_stmt_print().
Pablo Neira Ayuso
maintainerQuoted 23 lines · Pablo Neira Ayuso
Quoted 5 lines · Elise Lennion
To don't trigger false errors because of unrelated traffic on the tested machine.
Tests, which have rules with counter and 'ok' result, are updated to avoid new Warnings.
Also applied, thanks.
tests/py/ip/flowtable.t line 5
Quoted 10 lines
tests/py/ip/flowtable.t +1
-1@@ -2,4 +2,4 @@ *ip;test-ip;input -flow table xyz { ip saddr timeout 30s counter packets 0 bytes 0};ok +flow table xyz { ip saddr timeout 30s counter};okThis reminds something: From flow tables, counter, quota, and limit must always be printed in their stateless version.
Quoted 3 lines
A simple way to fix this is to turn
stateless_outputinto unsigned int, so you can stateless_output++ before printing the statement fromflow_stmt_print().
As well stateless_output-- after printing it, to restore the counter to its previous state.