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/ip6/chains.t | 4 ++-- tests/py/ip6/dnat.t | 3 ++- tests/py/ip6/dst.t | 5 +++-- tests/py/ip6/dup.t | 3 ++- tests/py/ip6/ether.t | 4 ++-- tests/py/ip6/hbh.t | 5 +++-- tests/py/ip6/icmpv6.t | 7 ++++--- tests/py/ip6/ip6.t | 5 +++-- tests/py/ip6/masquerade.t | 3 ++- tests/py/ip6/mh.t | 5 +++-- tests/py/ip6/redirect.t | 3 ++- tests/py/ip6/reject.t | 3 ++- tests/py/ip6/rt.t | 5 +++-- tests/py/ip6/sets.t | 5 +++-- tests/py/ip6/snat.t | 3 ++- tests/py/ip6/vmap.t | 5 +++-- 16 files changed, 41 insertions(+), 27 deletions(-) (limited to 'tests/py/ip6') diff --git a/tests/py/ip6/chains.t b/tests/py/ip6/chains.t index c1e41e47..e78f9e08 100644 --- a/tests/py/ip6/chains.t +++ b/tests/py/ip6/chains.t @@ -1,5 +1,3 @@ -*ip6;test-ip6 - # filter chains available are: input, output, forward, forward, prerouting and postrouting. :filter-input;type filter hook input priority 0 :filter-prer;type filter hook prerouting priority 0 @@ -15,3 +13,5 @@ # route chain available is output. :route-out;type route hook output priority 0 + +*ip6;test-ip6;filter-input,filter-prer,filter-forw-t,filter-out-t,filter-post-t,nat-input,nat-prerouting,nat-output,nat-postrou,route-out diff --git a/tests/py/ip6/dnat.t b/tests/py/ip6/dnat.t index 83412258..b061f2f6 100644 --- a/tests/py/ip6/dnat.t +++ b/tests/py/ip6/dnat.t @@ -1,5 +1,6 @@ -*ip6;test-ip6 :prerouting;type nat hook prerouting priority 0 +*ip6;test-ip6;prerouting + tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::80-100;ok tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100;ok;tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::100 diff --git a/tests/py/ip6/dst.t b/tests/py/ip6/dst.t index 3207af76..f7b0979d 100644 --- a/tests/py/ip6/dst.t +++ b/tests/py/ip6/dst.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + dst nexthdr 22;ok dst nexthdr != 233;ok dst nexthdr 33-45;ok diff --git a/tests/py/ip6/dup.t b/tests/py/ip6/dup.t index 34f302f2..e6bb78b8 100644 --- a/tests/py/ip6/dup.t +++ b/tests/py/ip6/dup.t @@ -1,6 +1,7 @@ -*ip6;test-ip6 :input;type filter hook input priority 0 +*ip6;test-ip6;input + dup to abcd::1;ok dup to abcd::1 device eth0;ok dup to ip6 saddr map { abcd::1 : cafe::cafe } device eth0;ok diff --git a/tests/py/ip6/ether.t b/tests/py/ip6/ether.t index 98be273f..d94a0d21 100644 --- a/tests/py/ip6/ether.t +++ b/tests/py/ip6/ether.t @@ -1,7 +1,7 @@ -*ip6;test-ip6 - :input;type filter hook input priority 0 +*ip6;test-ip6;input + tcp dport 22 iiftype ether ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04 accept tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04;ok;tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04 tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip6 daddr 1::2;ok diff --git a/tests/py/ip6/hbh.t b/tests/py/ip6/hbh.t index 4e67c42a..235cce44 100644 --- a/tests/py/ip6/hbh.t +++ b/tests/py/ip6/hbh.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :filter-input;type filter hook input priority 0 +*ip6;test-ip6;filter-input +*inet;test-inet;filter-input + hbh hdrlength 22;ok hbh hdrlength != 233;ok hbh hdrlength 33-45;ok diff --git a/tests/py/ip6/icmpv6.t b/tests/py/ip6/icmpv6.t index fca903f6..af40bf71 100644 --- a/tests/py/ip6/icmpv6.t +++ b/tests/py/ip6/icmpv6.t @@ -1,8 +1,9 @@ -*ip6;test-ip6 -# BUG: There is a bug with icmpv6 and inet tables -# *inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +# BUG: There is a bug with icmpv6 and inet tables +# *inet;test-inet;input + icmpv6 type destination-unreachable accept;ok icmpv6 type packet-too-big accept;ok icmpv6 type time-exceeded accept;ok diff --git a/tests/py/ip6/ip6.t b/tests/py/ip6/ip6.t index d4c5c7e3..ceb2a823 100644 --- a/tests/py/ip6/ip6.t +++ b/tests/py/ip6/ip6.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + # BUG: Problem with version, priority # :1:1-38: Error: Could not process rule: Invalid argument # add rule ip6 test6 input ip6 version 1 diff --git a/tests/py/ip6/masquerade.t b/tests/py/ip6/masquerade.t index 4e6c086c..8040280e 100644 --- a/tests/py/ip6/masquerade.t +++ b/tests/py/ip6/masquerade.t @@ -1,6 +1,7 @@ -*ip6;test-ip6 :postrouting;type nat hook postrouting priority 0 +*ip6;test-ip6;postrouting + # nf_nat flags combination udp dport 53 masquerade;ok udp dport 53 masquerade random;ok diff --git a/tests/py/ip6/mh.t b/tests/py/ip6/mh.t index cd652b39..099a6ebc 100644 --- a/tests/py/ip6/mh.t +++ b/tests/py/ip6/mh.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + mh nexthdr 1;ok mh nexthdr != 1;ok mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp };ok;mh nexthdr { 58, 17, 108, 6, 51, 136, 50, 132, 33} diff --git a/tests/py/ip6/redirect.t b/tests/py/ip6/redirect.t index 31ffe8c9..d5a0a3b2 100644 --- a/tests/py/ip6/redirect.t +++ b/tests/py/ip6/redirect.t @@ -1,6 +1,7 @@ -*ip6;test-ip6 :output;type nat hook output priority 0 +*ip6;test-ip6;output + # with no arguments redirect;ok udp dport 954 redirect;ok diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t index 60dec90e..29799565 100644 --- a/tests/py/ip6/reject.t +++ b/tests/py/ip6/reject.t @@ -1,6 +1,7 @@ -*ip6;test-ip6 :output;type filter hook output priority 0 +*ip6;test-ip6;output + reject;ok reject with icmpv6 type no-route;ok reject with icmpv6 type admin-prohibited;ok diff --git a/tests/py/ip6/rt.t b/tests/py/ip6/rt.t index eca47ca8..7e700a5f 100644 --- a/tests/py/ip6/rt.t +++ b/tests/py/ip6/rt.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + rt nexthdr 1;ok rt nexthdr != 1;ok rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp};ok;rt nexthdr { 33, 136, 50, 132, 51, 17, 108, 6, 58} diff --git a/tests/py/ip6/sets.t b/tests/py/ip6/sets.t index 4938929c..e0daa3ab 100644 --- a/tests/py/ip6/sets.t +++ b/tests/py/ip6/sets.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + !set_ipv6_add1 ipv6_addr;ok !set_inet1 inet_proto;ok !set_inet inet_service;ok diff --git a/tests/py/ip6/snat.t b/tests/py/ip6/snat.t index 37bf1a1d..dec8dffa 100644 --- a/tests/py/ip6/snat.t +++ b/tests/py/ip6/snat.t @@ -1,5 +1,6 @@ -*ip6;test-ip6 :postrouting;type nat hook postrouting priority 0 +*ip6;test-ip6;postrouting + tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::80-100 tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::100;ok diff --git a/tests/py/ip6/vmap.t b/tests/py/ip6/vmap.t index 301a28ae..6a3a004e 100644 --- a/tests/py/ip6/vmap.t +++ b/tests/py/ip6/vmap.t @@ -1,7 +1,8 @@ -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip6;test-ip6;input +*inet;test-inet;input + ip6 saddr vmap { abcd::3 : accept };ok ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234:1234;fail -- cgit v1.2.3