summaryrefslogtreecommitdiffstats
path: root/tests/shell/testcases
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2018-10-11 17:48:59 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-10-15 13:37:51 +0200
commit90ed4fb3855f0d9d881b812c75e338e5e93081ba (patch)
tree7c039e162f93037d35497f5516c1e8a85c6cb7a7 /tests/shell/testcases
parent62cea2e4ca9d6bc781ced6518810144a8d697275 (diff)
monitor: Fix printing of ct objects
Monitor output is supposed to be single lined without tabs, but ct object were printed with newlines and tabs hard-coded. Fixing this wasn't too hard given that there is 'stmt_separator' to also include semi-colons where required if newline was removed. A more obvious mistake was position of object type in monitor output: Like with other object types, it has to occur between command and table spec. As a positive side-effect, this aligns ct objects better with others (see obj_type_name_array for instance). Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases')
-rwxr-xr-xtests/shell/testcases/listing/0013objects_02
-rwxr-xr-xtests/shell/testcases/nft-f/0017ct_timeout_obj_02
-rwxr-xr-xtests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/shell/testcases/listing/0013objects_0 b/tests/shell/testcases/listing/0013objects_0
index 2d72dbb5..713c783e 100755
--- a/tests/shell/testcases/listing/0013objects_0
+++ b/tests/shell/testcases/listing/0013objects_0
@@ -15,7 +15,7 @@ EXPECTED="table ip test {
ct timeout cttime {
protocol udp;
l3proto ip
- policy = {unreplied: 15, replied: 12}
+ policy = { unreplied: 15, replied: 12 }
}
chain input {
diff --git a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
index 1d03dbfc..448a8207 100755
--- a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
+++ b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
@@ -4,7 +4,7 @@ EXPECTED='table ip filter {
ct timeout cttime{
protocol tcp;
l3proto ip
- policy = {established: 123, close: 12}
+ policy = { established: 123, close: 12 }
}
chain c {
diff --git a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft
index af0c627b..bca36580 100755
--- a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft
@@ -2,7 +2,7 @@ table ip filter {
ct timeout cttime {
protocol tcp;
l3proto ip
- policy = {established: 123, close: 12}
+ policy = { established: 123, close: 12 }
}
chain c {