From 2d1126523bee642c7e74e66c8e025850c8129b9a Mon Sep 17 00:00:00 2001
From: Chris Horn <hornc@cray.com>
Date: Thu, 16 Jan 2020 13:31:47 -0600
Subject: [PATCH] LU-13147 tests: Cleanup sanity-lnet on test failure

Trap EXIT so we can cleanup on test failure.

Test-Parameters: trivial testlist=sanity-lnet
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I702b214046a68af2b87536dab01879c356bff2a8
Reviewed-on: https://review.whamcloud.com/37258
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/tests/sanity-lnet.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lustre/tests/sanity-lnet.sh b/lustre/tests/sanity-lnet.sh
index bd8de8f..a1a3b08 100755
--- a/lustre/tests/sanity-lnet.sh
+++ b/lustre/tests/sanity-lnet.sh
@@ -48,6 +48,7 @@ if module_loaded lnet ; then
 fi
 
 cleanup_testsuite() {
+	trap "" EXIT
 	rm -f $TMP/sanity-dlc*
 	cleanup_netns
 	cleanup_lnet
@@ -223,6 +224,8 @@ validate_gateway_nids() {
 cleanupall -f
 setup_netns || error "setup_netns failed with $?"
 
+stack_trap 'cleanup_testsuite' EXIT
+
 test_0() {
 	load_module ../lnet/lnet/lnet || error "Failed to load module rc = $?"
 	do_lnetctl lnet configure || error "lnet configure failed rc = $?"
-- 
1.8.3.1