Commit 3139c763 authored Mar 03, 2017 by Daniel Verkamp

test/nvmf: handle 'nvme disconnect' non-0 return



Newer versions of nvme-cli return a non-zero status from the disconnect
command when it is successful.  Catch this in the test scripts so that
the tests don't consider this a failure.

Change-Id: I3abf4042ec8b0bc8aed5a4c36128ae73230aa190
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>

parent 6a034512

test/nvmf/filesystem/filesystem.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,8 +71,8 @@ for dev in $devs; do
		done

		sync
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" \|\| true
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2" \|\| true

		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2

test/nvmf/fio/fio.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,8 @@ $testdir/nvmf_fio.py 4096 128 write 1 verify
		$testdir/nvmf_fio.py 4096 128 randwrite 1 verify

		sync
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" \|\| true
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2" \|\| true

		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2

test/nvmf/multiconnection/multiconnection.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ $testdir/../fio/nvmf_fio.py 262144 64 randwrite 10

		sync
		for i in `seq 1 12`; do
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}" \|\| true
		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode${i}
		done

test/nvmf/nvme_cli/nvme_cli.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,8 +48,8 @@ for ns in /dev/nvme?n*; do
		nvme id-ns $ns
		done

		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" \|\| true
		nvme disconnect -n "nqn.2016-06.io.spdk:cnode2" \|\| true

		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2