* [PATCH nft 1/9] tests: files: Remove jump chain tests.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
@ 2017-10-11 4:37 ` Varsha Rao
2017-10-11 4:41 ` [PATCH nft 2/9] tests: shell: Add test case for jump chain Varsha Rao
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:37 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
Tests for loop-detect 1, 2 and 3 are already there in tests/shell file.
New test for loop-detect.4 has been added to tests/shell file. So, remove
them.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/loop-detect.1 | 8 --------
tests/files/loop-detect.2 | 7 -------
tests/files/loop-detect.3 | 7 -------
tests/files/loop-detect.4 | 7 -------
4 files changed, 29 deletions(-)
delete mode 100644 tests/files/loop-detect.1
delete mode 100644 tests/files/loop-detect.2
delete mode 100644 tests/files/loop-detect.3
delete mode 100644 tests/files/loop-detect.4
diff --git a/tests/files/loop-detect.1 b/tests/files/loop-detect.1
deleted file mode 100644
index e55864c..0000000
--- a/tests/files/loop-detect.1
+++ /dev/null
@@ -1,8 +0,0 @@
-#! nft -f
-
-# Create table and empty chains for loop detection tests
-add table filter
-
-add chain filter chain1
-add chain filter chain2
-add chain filter chain3
diff --git a/tests/files/loop-detect.2 b/tests/files/loop-detect.2
deleted file mode 100644
index 88a95e0..0000000
--- a/tests/files/loop-detect.2
+++ /dev/null
@@ -1,7 +0,0 @@
-#! nft -f
-
-# Circular regular jumps: chain1 -> chain2 -> chain3 -> chain1
-flush table filter
-add filter chain1 jump chain2
-add filter chain2 jump chain3
-add filter chain3 jump chain1
diff --git a/tests/files/loop-detect.3 b/tests/files/loop-detect.3
deleted file mode 100644
index 80f7fc5..0000000
--- a/tests/files/loop-detect.3
+++ /dev/null
@@ -1,7 +0,0 @@
-#! nft -f
-
-# Circular jump when creating an anonymous verdict map: chain1 -> chain2 -> chain3 -> chain1
-flush table filter
-add filter chain1 jump chain2
-add filter chain2 jump chain3
-add filter chain3 ip daddr vmap { 10.0.0.1 : continue, 192.168.0.1 : jump chain1 }
diff --git a/tests/files/loop-detect.4 b/tests/files/loop-detect.4
deleted file mode 100644
index acd9a34..0000000
--- a/tests/files/loop-detect.4
+++ /dev/null
@@ -1,7 +0,0 @@
-#! nft -f
-
-# Circular jump with an intermediate anonymous verdict map: chain1 -> chain2 -> chain3 -> chain1
-flush table filter
-add filter chain1 jump chain2
-add filter chain2 ip daddr vmap { 10.0.0.1 : continue, 192.168.0.1 : jump chain3 }
-add filter chain3 jump chain1
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 2/9] tests: shell: Add test case for jump chain.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
2017-10-11 4:37 ` [PATCH nft 1/9] tests: files: Remove jump chain tests Varsha Rao
@ 2017-10-11 4:41 ` Varsha Rao
2017-10-11 4:44 ` [PATCH nft 3/9] tests: shell: Add test case for sets Varsha Rao
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:41 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
This patch adds test case for checking jump to non existing chain.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/shell/testcases/chains/0015check_jump_loop_1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100755 tests/shell/testcases/chains/0015check_jump_loop_1
diff --git a/tests/shell/testcases/chains/0015check_jump_loop_1 b/tests/shell/testcases/chains/0015check_jump_loop_1
new file mode 100755
index 0000000..059cfaa
--- /dev/null
+++ b/tests/shell/testcases/chains/0015check_jump_loop_1
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+$NFT add table t
+$NFT add chain t c1
+$NFT add chain t c2
+$NFT add t c1 jump c2
+# kernel should return ENOENT
+$NFT add t c2 ip daddr vmap { 1 : jump c3 }
+echo "E: Jumped to non existing chain" >&2
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 3/9] tests: shell: Add test case for sets.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
2017-10-11 4:37 ` [PATCH nft 1/9] tests: files: Remove jump chain tests Varsha Rao
2017-10-11 4:41 ` [PATCH nft 2/9] tests: shell: Add test case for jump chain Varsha Rao
@ 2017-10-11 4:44 ` Varsha Rao
2017-10-11 4:47 ` [PATCH nft 4/9] tests: files: Remove tests for set Varsha Rao
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:44 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
This patch adds test case for anonymous sets.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/shell/testcases/sets/0025anonymous_set_0 | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100755 tests/shell/testcases/sets/0025anonymous_set_0
diff --git a/tests/shell/testcases/sets/0025anonymous_set_0 b/tests/shell/testcases/sets/0025anonymous_set_0
new file mode 100755
index 0000000..93a7c02
--- /dev/null
+++ b/tests/shell/testcases/sets/0025anonymous_set_0
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Adding anonymous sets
+
+set -e
+
+$NFT add table t
+$NFT add chain t c { type filter hook output priority 0 \; }
+# set: IP addresses
+$NFT add rule t c ip daddr { \
+ 192.168.0.1, \
+ 192.168.0.2, \
+ 192.168.0.3, \
+}
+
+#set : tcp ports
+$NFT add rule t c tcp dport { 22, 23 } counter
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 4/9] tests: files: Remove tests for set.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (2 preceding siblings ...)
2017-10-11 4:44 ` [PATCH nft 3/9] tests: shell: Add test case for sets Varsha Rao
@ 2017-10-11 4:47 ` Varsha Rao
2017-10-11 4:51 ` [PATCH nft 5/9] tests: shell: Add tests for variable definition Varsha Rao
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:47 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
This patch removes test case for set. As new test case is added to
tests/shell file.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/set | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 tests/files/set
diff --git a/tests/files/set b/tests/files/set
deleted file mode 100644
index 3c040b0..0000000
--- a/tests/files/set
+++ /dev/null
@@ -1,14 +0,0 @@
-#! nft -f
-
-add table filter
-add chain filter output { type filter hook output priority 0 ; }
-
-# set: IP addresses
-add rule filter output ip daddr { \
- 192.168.0.1, \
- 192.168.0.2, \
- 192.168.0.3, \
-}
-
-# set: tcp ports
-add rule filter output tcp dport { 22, 23 } counter
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 5/9] tests: shell: Add tests for variable definition.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (3 preceding siblings ...)
2017-10-11 4:47 ` [PATCH nft 4/9] tests: files: Remove tests for set Varsha Rao
@ 2017-10-11 4:51 ` Varsha Rao
2017-10-11 4:53 ` [PATCH nft 6/9] tests: files: Remove test cases " Varsha Rao
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:51 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
This patch adds test cases for a variable definition and redefinition.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/shell/testcases/nft-f/0013defines_1 | 25 +++++++++++++++++++++++++
tests/shell/testcases/nft-f/0014defines_1 | 25 +++++++++++++++++++++++++
tests/shell/testcases/nft-f/0015defines_1 | 24 ++++++++++++++++++++++++
3 files changed, 74 insertions(+)
create mode 100755 tests/shell/testcases/nft-f/0013defines_1
create mode 100755 tests/shell/testcases/nft-f/0014defines_1
create mode 100755 tests/shell/testcases/nft-f/0015defines_1
diff --git a/tests/shell/testcases/nft-f/0013defines_1 b/tests/shell/testcases/nft-f/0013defines_1
new file mode 100755
index 0000000..5519703
--- /dev/null
+++ b/tests/shell/testcases/nft-f/0013defines_1
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Tests use of variable before definition.
+
+set -e
+
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
+ echo "Failed to create tmp file" >&2
+ exit 0
+fi
+
+trap "rm -rf $tmpfile" EXIT # cleanup if aborted
+
+echo "
+define var2 = \$var1
+define var1 = lo
+
+table ip t {
+ chain c {
+ iif \$var2
+ }
+}" >> $tmpfile
+
+$NFT -f $tmpfile
diff --git a/tests/shell/testcases/nft-f/0014defines_1 b/tests/shell/testcases/nft-f/0014defines_1
new file mode 100755
index 0000000..914d910
--- /dev/null
+++ b/tests/shell/testcases/nft-f/0014defines_1
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Tests redefinition of an existing variable.
+
+set -e
+
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
+ echo "Failed to create tmp file" >&2
+ exit 0
+fi
+
+trap "rm -rf $tmpfile" EXIT # cleanup if aborted
+
+echo "
+define var1 = lo
+define var1 = lo
+
+table ip t {
+ chain c {
+ iif \$var1
+ }
+}" >> $tmpfile
+
+$NFT -f $tmpfile
diff --git a/tests/shell/testcases/nft-f/0015defines_1 b/tests/shell/testcases/nft-f/0015defines_1
new file mode 100755
index 0000000..1f9db11
--- /dev/null
+++ b/tests/shell/testcases/nft-f/0015defines_1
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Tests recursive definition of a variable.
+
+set -e
+
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
+ echo "Failed to create tmp file" >&2
+ exit 0
+fi
+
+trap "rm -rf $tmpfile" EXIT # cleanup if aborted
+
+echo "
+define var1 = \$var1
+
+table ip t {
+ chain c {
+ iif \$var1
+ }
+}" >> $tmpfile
+
+$NFT -f $tmpfile
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 6/9] tests: files: Remove test cases for variable definition.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (4 preceding siblings ...)
2017-10-11 4:51 ` [PATCH nft 5/9] tests: shell: Add tests for variable definition Varsha Rao
@ 2017-10-11 4:53 ` Varsha Rao
2017-10-11 4:56 ` [PATCH nft 7/9] tests: files: Remove tests for chain Varsha Rao
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:53 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
New test cases for variable definition are added in tests/shell file.
So, remove these test cases.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/symbolic-define.1 | 7 -------
tests/files/symbolic-define.2 | 7 -------
tests/files/symbolic-define.3 | 6 ------
3 files changed, 20 deletions(-)
delete mode 100644 tests/files/symbolic-define.1
delete mode 100644 tests/files/symbolic-define.2
delete mode 100644 tests/files/symbolic-define.3
diff --git a/tests/files/symbolic-define.1 b/tests/files/symbolic-define.1
deleted file mode 100644
index 712ef71..0000000
--- a/tests/files/symbolic-define.1
+++ /dev/null
@@ -1,7 +0,0 @@
-#! nft -f
-
-# error: variable use before definition
-define var2 = $var1
-define var1 = eth0
-
-filter input iif $var2
diff --git a/tests/files/symbolic-define.2 b/tests/files/symbolic-define.2
deleted file mode 100644
index cd3c23c..0000000
--- a/tests/files/symbolic-define.2
+++ /dev/null
@@ -1,7 +0,0 @@
-#! nft -f
-
-# error: redefinition of an existing variable
-define var1 = eth0
-define var1 = eth0
-
-filter input iif $var1
diff --git a/tests/files/symbolic-define.3 b/tests/files/symbolic-define.3
deleted file mode 100644
index ba224df..0000000
--- a/tests/files/symbolic-define.3
+++ /dev/null
@@ -1,6 +0,0 @@
-#! nft -f
-
-# error: recursive definition of a variable
-define var1 = $var1
-
-filter input iif $var1
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 7/9] tests: files: Remove tests for chain.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (5 preceding siblings ...)
2017-10-11 4:53 ` [PATCH nft 6/9] tests: files: Remove test cases " Varsha Rao
@ 2017-10-11 4:56 ` Varsha Rao
2017-10-11 4:59 ` [PATCH nft 8/9] tests: files: Remove tests for table Varsha Rao
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:56 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
Test cases for chain are there in tests/shell file. So, remove these
testcases.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/obj-chain | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 tests/files/obj-chain
diff --git a/tests/files/obj-chain b/tests/files/obj-chain
deleted file mode 100644
index 2bce026..0000000
--- a/tests/files/obj-chain
+++ /dev/null
@@ -1,22 +0,0 @@
-#! nft -f
-
-add table filter
-
-# chains: add and delete chain
-add chain filter testchain
-delete chain filter testchain
-
-# chains: add and delete base chain
-add chain filter input { type filter hook input priority 0 ; }
-delete chain filter input
-
-# chains: can not delete chain while referenced
-add chain filter testchain
-add chain filter testchain2
-
-add rule filter testchain handle 1 jump testchain2
-delete chain filter testchain2
-delete rule filter testchain handle 1
-
-delete chain filter testchain2
-delete chain filter testchain
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 8/9] tests: files: Remove tests for table.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (6 preceding siblings ...)
2017-10-11 4:56 ` [PATCH nft 7/9] tests: files: Remove tests for chain Varsha Rao
@ 2017-10-11 4:59 ` Varsha Rao
2017-10-11 5:01 ` [PATCH nft 9/9] tests: files: Remove tests for verdict maps Varsha Rao
2017-10-11 9:57 ` [PATCH nft 0/9] tests: Move tests from files to shell Pablo Neira Ayuso
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 4:59 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
This patch removes test case for table. As test case for it is present
in tests/shell file.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/obj-table | 9 ---------
1 file changed, 9 deletions(-)
delete mode 100644 tests/files/obj-table
diff --git a/tests/files/obj-table b/tests/files/obj-table
deleted file mode 100644
index 8b264cf..0000000
--- a/tests/files/obj-table
+++ /dev/null
@@ -1,9 +0,0 @@
-#! nft -f
-
-# table: add and delete table
-add table filter
-table delete filter
-
-# table: deleting table with chain must fail
-add chain filter output
-table delete filter
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH nft 9/9] tests: files: Remove tests for verdict maps.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (7 preceding siblings ...)
2017-10-11 4:59 ` [PATCH nft 8/9] tests: files: Remove tests for table Varsha Rao
@ 2017-10-11 5:01 ` Varsha Rao
2017-10-11 9:57 ` [PATCH nft 0/9] tests: Move tests from files to shell Pablo Neira Ayuso
9 siblings, 0 replies; 13+ messages in thread
From: Varsha Rao @ 2017-10-11 5:01 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Varsha Rao, netfilter-devel
Remove test cases for verdict maps. As they are already there in
tests/shell file.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
tests/files/verdict-maps | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 tests/files/verdict-maps
diff --git a/tests/files/verdict-maps b/tests/files/verdict-maps
deleted file mode 100644
index c1630ce..0000000
--- a/tests/files/verdict-maps
+++ /dev/null
@@ -1,20 +0,0 @@
-#! nft -f
-#
-
-add table ip filter
-add chain ip filter input { type filter hook input priority 0; }
-
-add chain ip filter chain1
-add filter chain1 counter
-
-add chain ip filter chain2
-add filter chain2 counter
-
-add chain ip filter chain3
-add filter chain3 counter
-
-add filter input ip saddr vmap { \
- 10.0.0.0/24 : jump chain1, \
- 10.0.0.0/8 : jump chain2, \
- 8.8.8.8 : jump chain3 \
-}
--
2.13.6
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH nft 0/9] tests: Move tests from files to shell.
2017-10-11 4:33 [PATCH nft 0/9] tests: Move tests from files to shell Varsha Rao
` (8 preceding siblings ...)
2017-10-11 5:01 ` [PATCH nft 9/9] tests: files: Remove tests for verdict maps Varsha Rao
@ 2017-10-11 9:57 ` Pablo Neira Ayuso
2017-10-14 13:04 ` Varsha Rao
9 siblings, 1 reply; 13+ messages in thread
From: Pablo Neira Ayuso @ 2017-10-11 9:57 UTC (permalink / raw)
To: Varsha Rao; +Cc: netfilter-devel
Hi Varsha,
On Wed, Oct 11, 2017 at 10:03:56AM +0530, Varsha Rao wrote:
> Test files of tests/files/ are moved to tests/shell.
We have more than 100 tests these days, could you have a look at the
repository to see if this is adding redundant tests for what we have?
If we already have a test covering the same configuration, we should
just remove them from tests/files/.
Thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH nft 0/9] tests: Move tests from files to shell.
2017-10-11 9:57 ` [PATCH nft 0/9] tests: Move tests from files to shell Pablo Neira Ayuso
@ 2017-10-14 13:04 ` Varsha Rao
2017-10-17 11:08 ` Pablo Neira Ayuso
0 siblings, 1 reply; 13+ messages in thread
From: Varsha Rao @ 2017-10-14 13:04 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
Hello Pablo,
On Wed, Oct 11, 2017 at 3:27 PM, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> Hi Varsha,
>
> On Wed, Oct 11, 2017 at 10:03:56AM +0530, Varsha Rao wrote:
>> Test files of tests/files/ are moved to tests/shell.
>
> We have more than 100 tests these days, could you have a look at the
> repository to see if this is adding redundant tests for what we have?
> If we already have a test covering the same configuration, we should
> just remove them from tests/files/.
>
Sorry, the cover letter title and commit message looks misleading.
But I have removed the redundant ones and added tests which were
not there.
Thanks,
Varsha
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH nft 0/9] tests: Move tests from files to shell.
2017-10-14 13:04 ` Varsha Rao
@ 2017-10-17 11:08 ` Pablo Neira Ayuso
0 siblings, 0 replies; 13+ messages in thread
From: Pablo Neira Ayuso @ 2017-10-17 11:08 UTC (permalink / raw)
To: Varsha Rao; +Cc: netfilter-devel
On Sat, Oct 14, 2017 at 06:34:28PM +0530, Varsha Rao wrote:
> Hello Pablo,
>
> On Wed, Oct 11, 2017 at 3:27 PM, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > Hi Varsha,
> >
> > On Wed, Oct 11, 2017 at 10:03:56AM +0530, Varsha Rao wrote:
> >> Test files of tests/files/ are moved to tests/shell.
> >
> > We have more than 100 tests these days, could you have a look at the
> > repository to see if this is adding redundant tests for what we have?
> > If we already have a test covering the same configuration, we should
> > just remove them from tests/files/.
> >
> Sorry, the cover letter title and commit message looks misleading.
> But I have removed the redundant ones and added tests which were
> not there.
Thanks for clarifying, I have applied this.
^ permalink raw reply [flat|nested] 13+ messages in thread