nvme/003,004: Add missing calls to nvme disconnect

Tests 003 and 004 do not call  nvme disconnect. In most cases it is
cleaned up by removing the modules but it should be made explicit.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

diff --git a/tests/nvme/003 b/tests/nvme/003
index c6b3d4037aa6c054d1d2696f6a6046accfd0d1d4..374e6af0ca6fb5a06afd7e2b980be2ff406c17ce 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -42,6 +42,7 @@ test() {
                echo "Fail"
        fi
 
+       nvme disconnect -n nqn.2014-08.org.nvmexpress.discovery
        _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
        _remove_nvmet_subsystem "blktests-subsystem-1"
        _remove_nvmet_port "${port}"

diff --git a/tests/nvme/003.out b/tests/nvme/003.out
index 01b2756121599d39a3848688ccb65993fe8c24f8..beb356128c9d3f6ebea18de2c0365eecce60ea8c 100644 (file)
--- a/tests/nvme/003.out
+++ b/tests/nvme/003.out
@@ -1,2 +1,3 @@
 Running nvme/003
+NQN:nqn.2014-08.org.nvmexpress.discovery disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/004 b/tests/nvme/004
index 0506fa220de311b967b74fcdf3225c950f3da2b5..767aedaa0263fd948eaee5fd78eb7ff20abef515 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -40,6 +40,7 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
+       nvme disconnect -n "blktests-subsystem-1"
        _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
        _remove_nvmet_subsystem "blktests-subsystem-1"
        _remove_nvmet_port "${port}"

diff --git a/tests/nvme/004.out b/tests/nvme/004.out
index 53f911ecf329911585b811ab4bffba274ba2bccd..51f605227320a77820329078fac127201cdbfbd3 100644 (file)
--- a/tests/nvme/004.out
+++ b/tests/nvme/004.out
@@ -1,4 +1,5 @@
 Running nvme/004
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
+NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete