From 5fb625af9e89db915451992d8920b4fa353a1185 Mon Sep 17 00:00:00 2001 From: "Pablo M. Bermudo Garay" Date: Tue, 12 Jan 2016 01:26:57 +0100 Subject: tests/py: update test files syntax The test files have been adapted to the syntax defined in the previous commit "tests/py: modify supported test file syntax" Signed-off-by: Pablo M. Bermudo Garay Signed-off-by: Pablo Neira Ayuso --- tests/py/any/ct.t | 8 ++++---- tests/py/any/frag.t | 11 ++++++----- tests/py/any/limit.t | 11 ++++++----- tests/py/any/log.t | 11 ++++++----- tests/py/any/meta.t | 12 ++++++------ tests/py/any/queue.t | 12 ++++++------ 6 files changed, 34 insertions(+), 31 deletions(-) (limited to 'tests/py/any') diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t index d4022525..9434dc63 100644 --- a/tests/py/any/ct.t +++ b/tests/py/any/ct.t @@ -1,9 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet - :output;type filter hook output priority 0 +*ip;test-ip4;output +*ip6;test-ip6;output +*inet;test-inet;output + ct state new,established, related, untracked;ok;ct state established,related,new,untracked ct state != related;ok ct state {new,established, related, untracked};ok diff --git a/tests/py/any/frag.t b/tests/py/any/frag.t index d61a3d4f..91386370 100644 --- a/tests/py/any/frag.t +++ b/tests/py/any/frag.t @@ -1,10 +1,11 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*arp;test-arp -*bridge;test-bridge :output;type filter hook output priority 0 +*ip;test-ip4;output +*ip6;test-ip6;output +*inet;test-inet;output +*arp;test-arp;output +*bridge;test-bridge;output + frag nexthdr tcp;ok;frag nexthdr 6 frag nexthdr != icmp;ok;frag nexthdr != 1 frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp};ok;frag nexthdr { 51, 136, 132, 6, 108, 50, 17, 33} diff --git a/tests/py/any/limit.t b/tests/py/any/limit.t index 96ffe609..2dcab815 100644 --- a/tests/py/any/limit.t +++ b/tests/py/any/limit.t @@ -1,10 +1,11 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*arp;test-arp -*bridge;test-bridge :output;type filter hook output priority 0 +*ip;test-ip4;output +*ip6;test-ip6;output +*inet;test-inet;output +*arp;test-arp;output +*bridge;test-bridge;output + limit rate 400/minute;ok limit rate 20/second;ok limit rate 400/hour;ok diff --git a/tests/py/any/log.t b/tests/py/any/log.t index 0eed5807..99a7f1f1 100644 --- a/tests/py/any/log.t +++ b/tests/py/any/log.t @@ -1,10 +1,11 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*arp;test-arp -*bridge;test-bridge :output;type filter hook output priority 0 +*ip;test-ip4;output +*ip6;test-ip6;output +*inet;test-inet;output +*arp;test-arp;output +*bridge;test-bridge;output + log;ok log level emerg;ok log level alert;ok diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index c03e7f4e..245f0ece 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -1,11 +1,11 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*arp;test-arp -*bridge;test-bridge - :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input +*arp;test-arp;input +*bridge;test-bridge;input + meta length 1000;ok meta length 22;ok meta length != 233;ok diff --git a/tests/py/any/queue.t b/tests/py/any/queue.t index 600c1121..a1aefa19 100644 --- a/tests/py/any/queue.t +++ b/tests/py/any/queue.t @@ -1,11 +1,11 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*arp;test-arp -*bridge;test-bridge - :output;type filter hook output priority 0 +*ip;test-ip4;output +*ip6;test-ip6;output +*inet;test-inet;output +*arp;test-arp;output +*bridge;test-bridge;output + queue;ok;queue num 0 queue num 2;ok queue num 2-3;ok -- cgit v1.2.3