nvme/026: use consistent coding style

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

diff --git a/tests/nvme/026 b/tests/nvme/026
index f91557960b2873a21607506cacb0292cad2f20c8..2e9655bdd40f5930883baca7d1263398540a4821 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -38,11 +38,11 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       nvme ns-descs "/dev/${nvmedev}" -n 1 > /dev/null 2>&1
-
-       rc=$?
+       if ! nvme ns-descs "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+               echo "ERROR: ns-desc 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}"
@@ -53,9 +53,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/026.out b/tests/nvme/026.out
index dcee48100a1a9278ebd05221cf234ff73e557672..c934cac92af07738cccd9f866c293b43f7906065 100644 (file)
--- a/tests/nvme/026.out
+++ b/tests/nvme/026.out
@@ -1,5 +1,4 @@
 Running nvme/026
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete