nvme/024: use consistent coding style

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

diff --git a/tests/nvme/024 b/tests/nvme/024
index 313f778c20f7be20c9b6632e9228818c167ab2c4..c88fbd8a3663af05fb16a16fcc3b9d11804e920f 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -38,11 +38,10 @@ 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=$?
-
-       nvme disconnect -n "${subsys_name}"
+       if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+               echo "ERROR: smart-log file-ns failed"
+       fi
+       nvme disconnect -n "${subsys_name}" >> "$FULL" 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/024.out b/tests/nvme/024.out
index 737d22f2eab1def6d02f609b003583949d8c60c7..0b1a3502f9378a1d31365e6198578462d318aa2f 100644 (file)
--- a/tests/nvme/024.out
+++ b/tests/nvme/024.out
@@ -1,5 +1,4 @@
 Running nvme/024
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete