nvme/027: use consistent coding style

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

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