diff options
author | Phil Sutter <phil@nwl.cc> | 2017-07-25 20:39:43 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-07-27 10:50:21 +0200 |
commit | 3c3c91bda0e0e17ff7791eff5614276bd1c6c148 (patch) | |
tree | e582081a1a3137d2c733872883359423379aaa68 /tests | |
parent | 8a3b2e7327a3057b5976df4af387b8143aad6110 (diff) |
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 <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/monitor/run-tests.sh | 4 | ||||
-rw-r--r-- | tests/monitor/testcases/set-maps.t | 7 | ||||
-rw-r--r-- | tests/monitor/testcases/set-mixed.t | 10 | ||||
-rw-r--r-- | tests/monitor/testcases/set-multiple.t | 7 | ||||
-rw-r--r-- | tests/monitor/testcases/set-simple.t | 21 |
5 files changed, 20 insertions, 29 deletions
diff --git a/tests/monitor/run-tests.sh b/tests/monitor/run-tests.sh index e21ed688..de194624 100755 --- a/tests/monitor/run-tests.sh +++ b/tests/monitor/run-tests.sh @@ -20,6 +20,10 @@ cmd_append() { echo "$*" >>$command_file } output_append() { + [[ "$*" == '-' ]] && { + cat $command_file >>$output_file + return + } echo "$*" >>$output_file } run_test() { 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 - |