nvme/021: use consistent coding style

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

diff --git a/tests/nvme/021 b/tests/nvme/021
index 8e9512adb5af6abd4fec258882d237a09b7747e5..fef31b080c99edfa9d5113f71cd577502cd168d4 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -38,11 +38,11 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       nvme list > /dev/null 2>&1
-
-       rc=$?
+       if ! nvme list 2>> "$FULL" | grep -q "${nvmedev}n1"; then
+               echo "ERROR: device not listed"
+       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/021.out b/tests/nvme/021.out
index 5fb06018cdc23662047511cb4041551221e105e5..b6b1a7ce0f1754aef5b9aee9ecc0dcc30ef3cc11 100644 (file)
--- a/tests/nvme/021.out
+++ b/tests/nvme/021.out
@@ -1,5 +1,4 @@
 Running nvme/021
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete