tests/nvme: misc fix and coding style update

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>

diff --git a/tests/nvme/010 b/tests/nvme/010
index 150a4e540f3eaed36f609cc84cb0849f8ce963a9..08e39d5a44c9da070a5945bc7432565915785a8e 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -11,7 +11,7 @@ TIMED=1
 
 requires() {
        _nvme_requires
-       _have_fio _have_modules loop
+       _have_fio && _have_modules loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index c4e75b09796a4061707e9598d3af5aa8065821ec..6bb49720cdce04e570d390e7b49b98e0ec012b2d 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -13,7 +13,7 @@ TIMED=1
 requires() {
        _nvme_requires
        _have_xfs
-       _have_program fio
+       _have_fio
        _have_modules loop
        _require_nvme_trtype_is_fabrics
 }

diff --git a/tests/nvme/030 b/tests/nvme/030
index 37df902da8952a46b3c690593e822c8091865f85..c6d485eb062ccf43e31037f055596fb7ee476bf6 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -36,7 +36,7 @@ test() {
 
        echo "Running ${TEST_NAME}"
 
-    _setup_nvmet
+       _setup_nvmet
 
        port="$(_create_nvmet_port "${nvme_trtype}")"