From 8bbf030baa8169312e81c5a43a5ee2adfeb925d5 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 12 Jan 2016 16:38:19 +0100 Subject: tests/py: don't test log statement from protocol match I think this unit tests should be self-contained at some level. The shell/ directory should be used to catch regressions at ruleset level, ie. these kind of combinations. Another motivation is that I want that netdev/ingress gets tested (coming in a follow up patch), and we don't support log there yet, so I would need to skip this test for that case. Signed-off-by: Pablo Neira Ayuso --- tests/py/ip/ip.t.payload.inet | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'tests/py/ip/ip.t.payload.inet') diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet index 35f73ff7..4d4d4859 100644 --- a/tests/py/ip/ip.t.payload.inet +++ b/tests/py/ip/ip.t.payload.inet @@ -157,13 +157,12 @@ inet test-inet input [ cmp eq reg 1 0x00000000 ] [ immediate reg 0 drop ] -# ip ttl 233 log +# ip ttl 233 inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 8 => reg 1 ] [ cmp eq reg 1 0x000000e9 ] - [ log prefix (null) ] # ip ttl 33-55 inet test-inet input @@ -201,21 +200,19 @@ inet test-inet input [ payload load 1b @ network header + 8 => reg 1 ] [ lookup reg 1 set set%d ] -# ip protocol tcp log +# ip protocol tcp inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] - [ log prefix (null) ] -# ip protocol != tcp log +# ip protocol != tcp inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 9 => reg 1 ] [ cmp neq reg 1 0x00000006 ] - [ log prefix (null) ] # ip protocol { icmp, esp, ah, comp, udp, udplite, tcp, dccp, sctp} accept set%d test-inet 3 @@ -309,21 +306,19 @@ inet test-inet input [ payload load 8b @ network header + 12 => reg 1 ] [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] -# ip saddr != 1.1.1.1 log prefix giuseppe +# ip saddr != 1.1.1.1 inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 4b @ network header + 12 => reg 1 ] [ cmp neq reg 1 0x01010101 ] - [ log prefix giuseppe ] -# ip saddr 1.1.1.1 log prefix example group 1 +# ip saddr 1.1.1.1 inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 4b @ network header + 12 => reg 1 ] [ cmp eq reg 1 0x01010101 ] - [ log prefix example group 1 snaplen 0 qthreshold 0] # ip daddr 192.168.0.1-192.168.0.250 inet test-inet input @@ -433,13 +428,12 @@ inet test-inet input [ cmp eq reg 1 0x0100a8c0 ] [ immediate reg 0 drop ] -# ip daddr 192.168.0.2 log +# ip daddr 192.168.0.2 inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 4b @ network header + 16 => reg 1 ] [ cmp eq reg 1 0x0200a8c0 ] - [ log prefix (null) ] # ip saddr \& 0xff == 1 inet test-inet input -- cgit v1.2.3