---
tests/nvme/027 | 15 +++++----------
tests/nvme/027.out | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/027 b/tests/nvme/027
index 8d47f56..96107e2 100755
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -38,11 +38,10 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
-
- nvme disconnect -n "${subsys_name}"
+ if ! nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "ERROR: ns-rescan failed"
+ fi
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -53,9 +52,5 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
+ echo "Test complete"
}
diff --git a/tests/nvme/027.out b/tests/nvme/027.out
index f114fcd..5c6ed26 100644
--- a/tests/nvme/027.out
+++ b/tests/nvme/027.out
@@ -1,5 +1,4 @@
Running nvme/027
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
2.19.1
