nvmf: Disconnect the initiator on test exit.

Change-Id: I8e640a77dc4c17582ff5ec0a4daba4f1d509c30c Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-07-25 08:20:11 -07:00 · 2016-07-25 08:20:11 -07:00 · 0e1dcce24a
commit 0e1dcce24a
parent 8c094266ac
3 changed files with 6 additions and 2 deletions
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@ -81,8 +81,6 @@ function allocate_nic_ips()

 function nvmfcleanup()
 {
-	sync
-	sleep 5
 	sync
 	rmmod nvme-rdma
 }
--- a/test/nvmf/filesystem/filesystem.sh
+++ b/test/nvmf/filesystem/filesystem.sh
@ -60,6 +60,9 @@ for dev in $devs; do
 	done
 done

+sync
+nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
+
 trap - SIGINT SIGTERM EXIT

 nvmfcleanup
--- a/test/nvmf/fio/fio.sh
+++ b/test/nvmf/fio/fio.sh
@ -35,6 +35,9 @@ $testdir/nvmf_fio.py 4096 1 randrw 1 verify
 $testdir/nvmf_fio.py 4096 128 rw 1 verify
 $testdir/nvmf_fio.py 4096 128 randrw 1 verify

+sync
+nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
+
 rm -f ./local-job0-0-verify.state

 trap - SIGINT SIGTERM EXIT