From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Date: Thu, 21 Feb 2019 04:42:48 +0000 (-0800)
Subject: nvme/028: use consistent coding style
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ecc19ef2db32926ca4efde8adf19434143e11ba;p=users%2Fsagi%2Fblktests.git

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 3478acc..10be8fb 100755
--- 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 c92b82d..536067f 100644
--- 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