linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org
Cc: osandov@osandov.com, bvanassche@acm.org,
	Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH 1/8] nvme/021: use consistent coding style
Date: Tue, 19 Feb 2019 15:28:18 -0800	[thread overview]
Message-ID: <1550618905-4112-2-git-send-email-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <1550618905-4112-1-git-send-email-chaitanya.kulkarni@wdc.com>

---
 tests/nvme/021     | 15 ++++++---------
 tests/nvme/021.out |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/nvme/021 b/tests/nvme/021
index 8e9512a..f204a2f 100755
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -38,11 +38,13 @@ test() {
 	cat "/sys/block/${nvmedev}n1/uuid"
 	cat "/sys/block/${nvmedev}n1/wwid"
 
-	nvme list > /dev/null 2>&1
-
-	rc=$?
+	if ! nvme list | grep -q "${nvmedev}n1" > /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}"
@@ -53,9 +55,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/021.out b/tests/nvme/021.out
index 5fb0601..b6b1a7c 100644
--- 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
-- 
1.8.3.1


  reply	other threads:[~2019-02-19 23:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-19 23:28 ` Chaitanya Kulkarni [this message]
2019-02-20 18:10   ` [PATCH 1/8] nvme/021: use consistent coding style Omar Sandoval
2019-02-20 18:19     ` Chaitanya Kulkarni
2019-02-20 18:23       ` Omar Sandoval
2019-02-19 23:28 ` [PATCH 2/8] nvme/022: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 3/8] nvme/023: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 4/8] nvme/024: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 5/8] nvme/025: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 6/8] nvme/026: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 7/8] nvme/027: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 8/8] nvme/028: " Chaitanya Kulkarni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1550618905-4112-2-git-send-email-chaitanya.kulkarni@wdc.com \
    --to=chaitanya.kulkarni@wdc.com \
    --cc=bvanassche@acm.org \
    --cc=linux-block@vger.kernel.org \
    --cc=osandov@osandov.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).