nvme/023: use consistent coding style

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

diff --git a/tests/nvme/023 b/tests/nvme/023
index 34751044d1a5d81e98430e50c06b06d138c96bc3..de1a6bc0f975fa201f5b81da958fd69a44d430bd 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -41,11 +41,11 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1
-
-       rc=$?
+       if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+               echo "ERROR: smart-log bdev-ns failed"
+       fi
 
-       nvme disconnect -n "${subsys_name}"
+       nvme disconnect -n "${subsys_name}" >> "$FULL" 2>&1
 
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
        _remove_nvmet_subsystem "${subsys_name}"
@@ -58,9 +58,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/023.out b/tests/nvme/023.out
index aeb3ea72e32af23c882f5a5b875514115542313e..47c99ca07aa9ed2ffcba79e751b2c501bfb5dbb6 100644 (file)
--- a/tests/nvme/023.out
+++ b/tests/nvme/023.out
@@ -1,5 +1,4 @@
 Running nvme/023
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete