tests/nvme: misc fix and coding style update

yizhanglinux · osandov · commit e786064baa29 · 2021-11-22T11:13:42.000-08:00
Signed-off-by: Yi Zhang &lt;yi.zhang@redhat.com&gt;
diff --git 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
@@ -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
@@ -36,7 +36,7 @@ test() {
 
 	echo "Running ${TEST_NAME}"
 
-    _setup_nvmet
+	_setup_nvmet
 
 	port="$(_create_nvmet_port "${nvme_trtype}")"
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ TIMED=1`
`11`	`11`
`12`	`12`	`requires() {`
`13`	`13`	`_nvme_requires`
`14`		`- _have_fio _have_modules loop`
	`14`	`+ _have_fio && _have_modules loop`
`15`	`15`	`_require_nvme_trtype_is_fabrics`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ TIMED=1`
`13`	`13`	`requires() {`
`14`	`14`	`_nvme_requires`
`15`	`15`	`_have_xfs`
`16`		`- _have_program fio`
	`16`	`+ _have_fio`
`17`	`17`	`_have_modules loop`
`18`	`18`	`_require_nvme_trtype_is_fabrics`
`19`	`19`	`}`