From 3c3c91bda0e0e17ff7791eff5614276bd1c6c148 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 25 Jul 2017 20:39:43 +0200 Subject: tests/monitor: Simplify testcases By introducing 'O -' indicating that output should be identical as input, testcases can be simplified quite a bit. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/monitor/testcases/set-maps.t | 7 +++---- tests/monitor/testcases/set-mixed.t | 10 +++------- tests/monitor/testcases/set-multiple.t | 7 ++----- tests/monitor/testcases/set-simple.t | 21 ++++++++------------- 4 files changed, 16 insertions(+), 29 deletions(-) (limited to 'tests/monitor/testcases') diff --git a/tests/monitor/testcases/set-maps.t b/tests/monitor/testcases/set-maps.t index 6ea36cb9..3d86720e 100644 --- a/tests/monitor/testcases/set-maps.t +++ b/tests/monitor/testcases/set-maps.t @@ -1,11 +1,10 @@ # first the setup I add table ip t -O add table ip t I add map ip t portip { type inet_service: ipv4_addr; flags interval; } -O add map ip t portip { type inet_service : ipv4_addr;flags interval; } +O - I add element ip t portip { 80-100: 10.0.0.1 } -O add element ip t portip { 80-100 : 10.0.0.1 } +O - I add element ip t portip { 1024-65535: 10.0.0.1 } -O add element ip t portip { 1024-65535 : 10.0.0.1 } +O - diff --git a/tests/monitor/testcases/set-mixed.t b/tests/monitor/testcases/set-mixed.t index 2eb35b5a..9c1c5323 100644 --- a/tests/monitor/testcases/set-mixed.t +++ b/tests/monitor/testcases/set-mixed.t @@ -1,19 +1,15 @@ # first the setup I add table ip t -O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval; } I add set ip t ports { type inet_service; } -O add set ip t ports { type inet_service;} +O - # make sure concurrent adds work I add element ip t portrange { 1024-65535 } I add element ip t ports { 10 } -O add element ip t portrange { 1024-65535 } -O add element ip t ports { 10 } +O - # delete items again I delete element ip t portrange { 1024-65535 } I delete element ip t ports { 10 } -O delete element ip t portrange { 1024-65535 } -O delete element ip t ports { 10 } +O - diff --git a/tests/monitor/testcases/set-multiple.t b/tests/monitor/testcases/set-multiple.t index ce919125..ad91fac0 100644 --- a/tests/monitor/testcases/set-multiple.t +++ b/tests/monitor/testcases/set-multiple.t @@ -1,13 +1,10 @@ # first the setup I add table ip t -O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval; } I add set ip t portrange2 { type inet_service; flags interval; } -O add set ip t portrange2 { type inet_service;flags interval; } +O - # make sure concurrent adds work I add element ip t portrange { 1024-65535 } I add element ip t portrange2 { 10-20 } -O add element ip t portrange { 1024-65535 } -O add element ip t portrange2 { 10-20 } +O - diff --git a/tests/monitor/testcases/set-simple.t b/tests/monitor/testcases/set-simple.t index e44cce08..ebff7cbd 100644 --- a/tests/monitor/testcases/set-simple.t +++ b/tests/monitor/testcases/set-simple.t @@ -1,14 +1,13 @@ # first the setup I add table ip t -O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval; } +O - # adding some ranges I add element ip t portrange { 1-10 } -O add element ip t portrange { 1-10 } +O - I add element ip t portrange { 1024-65535 } -O add element ip t portrange { 1024-65535 } +O - I add element ip t portrange { 20-30, 40-50 } O add element ip t portrange { 20-30 } O add element ip t portrange { 40-50 } @@ -22,26 +21,22 @@ O delete element ip t portrange { 1-10 } # make sure lower scope boundary works I add element ip t portrange { 0-10 } -O add element ip t portrange { 0-10 } +O - # make sure half open before other element works I add element ip t portrange { 1024-65535 } I add element ip t portrange { 100-200 } -O add element ip t portrange { 1024-65535 } -O add element ip t portrange { 100-200 } +O - # make sure deletion of elements works I delete element ip t portrange { 0-10 } -O delete element ip t portrange { 0-10 } +O - I delete element ip t portrange { 100-200 } I delete element ip t portrange { 1024-65535 } -O delete element ip t portrange { 100-200 } -O delete element ip t portrange { 1024-65535 } +O - # make sure mixed add/delete works I add element ip t portrange { 10-20 } I add element ip t portrange { 1024-65535 } I delete element ip t portrange { 10-20 } -O add element ip t portrange { 10-20 } -O add element ip t portrange { 1024-65535 } -O delete element ip t portrange { 10-20 } +O - -- cgit v1.2.3