diff mbox series

[5/8] nvme/025: use consistent coding style

Message ID 1550618905-4112-6-git-send-email-chaitanya.kulkarni@wdc.com (mailing list archive)
State New, archived
Headers show
Series nvme: misc cleanups | expand

Commit Message

Chaitanya Kulkarni Feb. 19, 2019, 11:28 p.m. UTC 
---
 tests/nvme/025     | 16 ++++++----------
 tests/nvme/025.out |  1 -
 2 files changed, 6 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/tests/nvme/025 b/tests/nvme/025
index 741d374..c2092d3 100755
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -38,11 +38,13 @@  test() {
 	cat "/sys/block/${nvmedev}n1/uuid"
 	cat "/sys/block/${nvmedev}n1/wwid"
 
-	nvme effects-log "/dev/${nvmedev}" > /dev/null 2>&1
-
-	rc=$?
+	if ! nvme effects-log "/dev/${nvmedev}" > /dev/null 2>&1; then
+		echo "Test Failed"
+	else
+		echo "Test complete"
+	fi
 
-	nvme disconnect -n "${subsys_name}"
+	nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
 
 	_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
 	_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@  test() {
 
 	modprobe -r nvme-loop
 	modprobe -r nvmet
-
-	if [ $rc -ne 0 ]; then
-		echo "Test Failed"
-	else
-		echo "Test complete"
-	fi
 }
diff --git a/tests/nvme/025.out b/tests/nvme/025.out
index b700bc7..f15ff2f 100644
--- a/tests/nvme/025.out
+++ b/tests/nvme/025.out
@@ -1,5 +1,4 @@ 
 Running nvme/025
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete