---
tests/nvme/022 | 16 ++++++----------
tests/nvme/022.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/022 b/tests/nvme/022
index 8f89d03..3b5a101 100755
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme reset "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
+ if ! nvme reset "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/022.out b/tests/nvme/022.out
index 173158a..1d393db 100644
--- a/tests/nvme/022.out
+++ b/tests/nvme/022.out
@@ -1,5 +1,4 @@
Running nvme/022
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
