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/inet/ah.t | 7 ++++--- tests/py/inet/comp.t | 8 ++++---- tests/py/inet/dccp.t | 7 ++++--- tests/py/inet/esp.t | 7 ++++--- tests/py/inet/ether-ip.t | 3 ++- tests/py/inet/ether.t | 10 +++++----- tests/py/inet/ip.t | 8 ++++---- tests/py/inet/reject.t | 3 ++- tests/py/inet/sctp.t | 7 ++++--- tests/py/inet/tcp.t | 7 ++++--- tests/py/inet/udp.t | 7 ++++--- tests/py/inet/udplite.t | 7 ++++--- 12 files changed, 45 insertions(+), 36 deletions(-) (limited to 'tests/py/inet') diff --git a/tests/py/inet/ah.t b/tests/py/inet/ah.t index 666659d3..f3848b7f 100644 --- a/tests/py/inet/ah.t +++ b/tests/py/inet/ah.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + # nexthdr Bug to list table. - ah nexthdr esp;ok diff --git a/tests/py/inet/comp.t b/tests/py/inet/comp.t index f4753bbc..6396ff36 100644 --- a/tests/py/inet/comp.t +++ b/tests/py/inet/comp.t @@ -1,9 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet - :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + # BUG: nft: payload.c:88: payload_expr_pctx_update: Assertion `left->payload.base + 1 <= (__PROTO_BASE_MAX - 1)' failed. - comp nexthdr esp;ok;comp nexthdr 50 comp nexthdr != esp;ok;comp nexthdr != 50 diff --git a/tests/py/inet/dccp.t b/tests/py/inet/dccp.t index e323992e..63de1c8b 100644 --- a/tests/py/inet/dccp.t +++ b/tests/py/inet/dccp.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + dccp sport 21-35;ok dccp sport != 21-35;ok dccp sport {23, 24, 25};ok diff --git a/tests/py/inet/esp.t b/tests/py/inet/esp.t index 3a8502d9..105acb25 100644 --- a/tests/py/inet/esp.t +++ b/tests/py/inet/esp.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + esp spi 100;ok esp spi != 100;ok esp spi 111-222;ok diff --git a/tests/py/inet/ether-ip.t b/tests/py/inet/ether-ip.t index 3726db45..a451588b 100644 --- a/tests/py/inet/ether-ip.t +++ b/tests/py/inet/ether-ip.t @@ -1,5 +1,6 @@ -*inet;test-inet :input;type filter hook input priority 0 +*inet;test-inet;input + tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4 accept tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok diff --git a/tests/py/inet/ether.t b/tests/py/inet/ether.t index 9d0f9729..1659a30b 100644 --- a/tests/py/inet/ether.t +++ b/tests/py/inet/ether.t @@ -1,10 +1,10 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet -*bridge;test-bridge - :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input +*bridge;test-bridge;input + tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 meta nfproto ipv4 accept tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept;ok diff --git a/tests/py/inet/ip.t b/tests/py/inet/ip.t index a56c5c97..ffcb47e7 100644 --- a/tests/py/inet/ip.t +++ b/tests/py/inet/ip.t @@ -1,7 +1,7 @@ -*ip;test-ip4 -*inet;test-inet -*bridge;test-bridge - :input;type filter hook input priority 0 +*ip;test-ip4;input +*inet;test-inet;input +*bridge;test-bridge;input + ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe };ok diff --git a/tests/py/inet/reject.t b/tests/py/inet/reject.t index 52e7b28b..638f329c 100644 --- a/tests/py/inet/reject.t +++ b/tests/py/inet/reject.t @@ -1,6 +1,7 @@ -*inet;test-inet :input;type filter hook input priority 0 +*inet;test-inet;input + # The output is specific for inet family reject with icmp type host-unreachable;ok;meta nfproto ipv4 reject with icmp type host-unreachable reject with icmp type net-unreachable;ok;meta nfproto ipv4 reject with icmp type net-unreachable diff --git a/tests/py/inet/sctp.t b/tests/py/inet/sctp.t index 537a9b17..75c58b8d 100644 --- a/tests/py/inet/sctp.t +++ b/tests/py/inet/sctp.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + sctp sport 23;ok sctp sport != 23;ok sctp sport 23-44;ok diff --git a/tests/py/inet/tcp.t b/tests/py/inet/tcp.t index 53a16898..cc19ed4c 100644 --- a/tests/py/inet/tcp.t +++ b/tests/py/inet/tcp.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + tcp dport 22;ok tcp dport != 233;ok tcp dport 33-45;ok diff --git a/tests/py/inet/udp.t b/tests/py/inet/udp.t index 58f4002d..30c06e4e 100644 --- a/tests/py/inet/udp.t +++ b/tests/py/inet/udp.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip;test-ip6 -*ip;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip;test-ip6;input +*ip;test-inet;input + udp sport 80 accept;ok udp sport != 60 accept;ok udp sport 50-70 accept;ok diff --git a/tests/py/inet/udplite.t b/tests/py/inet/udplite.t index 9420ab45..ba01f671 100644 --- a/tests/py/inet/udplite.t +++ b/tests/py/inet/udplite.t @@ -1,8 +1,9 @@ -*ip;test-ip4 -*ip6;test-ip6 -*inet;test-inet :input;type filter hook input priority 0 +*ip;test-ip4;input +*ip6;test-ip6;input +*inet;test-inet;input + udplite sport 80 accept;ok udplite sport != 60 accept;ok udplite sport 50-70 accept;ok -- cgit v1.2.3