nvme/028: use consistent coding style

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

diff --git a/tests/nvme/028 b/tests/nvme/028
index 3478acc8796efc1c185698750cd52307c7cfeeaf..10be8fb4ba9c87c74130f5449c44361552c0d373 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -38,11 +38,10 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       nvme list-subsys | grep -q loop
-
-       rc=$?
-
-       nvme disconnect -n "${subsys_name}"
+       if ! nvme list-subsys 2>> "$FULL" | grep -q loop; then
+               echo "ERROR: list-subsys"
+       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/028.out b/tests/nvme/028.out
index c92b82dcf3652310cc03223f83d3cad106727074..536067f62fd0f4ec7b1bfe717d67350aaf1f6559 100644 (file)
--- a/tests/nvme/028.out
+++ b/tests/nvme/028.out
@@ -1,5 +1,4 @@
 Running nvme/028
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete