Patchwork [net-next] selftests: rtnetlink: remove testns on test fail

login
register
mail settings
Submitter Prashant Bhole
Date March 2, 2018, 2:22 a.m.
Message ID <20180302022220.3508-1-bhole_prashant_q7@lab.ntt.co.jp>
Download mbox | patch
Permalink /patch/463651/
State New
Headers show

Comments

Prashant Bhole - March 2, 2018, 2:22 a.m.
This patch removes testns after test failure so that next test can
continue with clean ns

Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
---
 tools/testing/selftests/net/rtnetlink.sh | 6 ++++++
 1 file changed, 6 insertions(+)
William Tu - March 2, 2018, 1:38 p.m.
On Thu, Mar 1, 2018 at 6:22 PM, Prashant Bhole
<bhole_prashant_q7@lab.ntt.co.jp> wrote:
> This patch removes testns after test failure so that next test can
> continue with clean ns
>
> Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>

Thanks for the fix.

Acked-by: William Tu <u9012063@gmail.com>
David Miller - March 4, 2018, 11:36 p.m.
From: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Date: Fri,  2 Mar 2018 11:22:20 +0900

> This patch removes testns after test failure so that next test can
> continue with clean ns
> 
> Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>

Applied.

Patch

diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh
index a622eeecc3a6..e6f485235435 100755
--- a/tools/testing/selftests/net/rtnetlink.sh
+++ b/tools/testing/selftests/net/rtnetlink.sh
@@ -517,6 +517,7 @@  kci_test_gretap()
 	ip link help gretap 2>&1 | grep -q "^Usage:"
 	if [ $? -ne 0 ];then
 		echo "SKIP: gretap: iproute2 too old"
+		ip netns del "$testns"
 		return 1
 	fi
 
@@ -543,6 +544,7 @@  kci_test_gretap()
 
 	if [ $ret -ne 0 ]; then
 		echo "FAIL: gretap"
+		ip netns del "$testns"
 		return 1
 	fi
 	echo "PASS: gretap"
@@ -565,6 +567,7 @@  kci_test_ip6gretap()
 	ip link help ip6gretap 2>&1 | grep -q "^Usage:"
 	if [ $? -ne 0 ];then
 		echo "SKIP: ip6gretap: iproute2 too old"
+		ip netns del "$testns"
 		return 1
 	fi
 
@@ -591,6 +594,7 @@  kci_test_ip6gretap()
 
 	if [ $ret -ne 0 ]; then
 		echo "FAIL: ip6gretap"
+		ip netns del "$testns"
 		return 1
 	fi
 	echo "PASS: ip6gretap"
@@ -655,6 +659,7 @@  kci_test_erspan()
 
 	if [ $ret -ne 0 ]; then
 		echo "FAIL: erspan"
+		ip netns del "$testns"
 		return 1
 	fi
 	echo "PASS: erspan"
@@ -720,6 +725,7 @@  kci_test_ip6erspan()
 
 	if [ $ret -ne 0 ]; then
 		echo "FAIL: ip6erspan"
+		ip netns del "$testns"
 		return 1
 	fi
 	echo "PASS: ip6erspan"