[PATCH blktests 2/2] nvme/{003,041,044,052,057,058,060,062}: update arg for _nvme_connect_subsys

[Yi Zhang]

The previous patch changed the default behavior of _nvme_connect_subsys
to wait for the namespace ready, but we have some cases that don't need
to wait for the controller or namespace ready, so add
--no-wait-ns/--no-wait for these cases

Signed-off-by: Yi Zhang <yi.zhang at redhat.com>
---
 tests/nvme/003 | 2 +-
 tests/nvme/041 | 2 +-
 tests/nvme/044 | 4 ++--
 tests/nvme/052 | 2 +-
 tests/nvme/057 | 2 +-
 tests/nvme/058 | 2 +-
 tests/nvme/060 | 2 +-
 tests/nvme/062 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/nvme/003 b/tests/nvme/003
index 2222ad1..3d1415c 100755
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -28,7 +28,7 @@ test() {
 
 	_nvmet_target_setup
 
-	_nvme_connect_subsys --port none \
+	_nvme_connect_subsys --port none --no-wait-ns \
 			     --subsysnqn "nqn.2014-08.org.nvmexpress.discovery"
 
 	# This is ugly but checking for the absence of error messages is ...
diff --git a/tests/nvme/041 b/tests/nvme/041
index 94f84f1..6855a47 100755
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -41,7 +41,7 @@ test() {
 
 	# Test unauthenticated connection (should fail)
 	echo "Test unauthenticated connection (should fail)"
-	_nvme_connect_subsys
+	_nvme_connect_subsys --no-wait
 
 	_nvme_disconnect_subsys
 
diff --git a/tests/nvme/044 b/tests/nvme/044
index 7c08328..1352910 100755
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -60,7 +60,7 @@ test() {
 	# and invalid ctrl authentication
 	echo "Test invalid ctrl authentication (should fail)"
 	_nvme_connect_subsys --dhchap-secret "${hostkey}" \
-			     --dhchap-ctrl-secret "${hostkey}"
+			     --dhchap-ctrl-secret "${hostkey}" --no-wait
 
 	_nvme_disconnect_subsys
 
@@ -77,7 +77,7 @@ test() {
 	echo "Test invalid ctrl key (should fail)"
 	invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:"
 	_nvme_connect_subsys --dhchap-secret "${hostkey}" \
-			     --dhchap-ctrl-secret "${invkey}"
+			     --dhchap-ctrl-secret "${invkey}" --no-wait
 
 	_nvme_disconnect_subsys
 
diff --git a/tests/nvme/052 b/tests/nvme/052
index 22d8a9e..dd498b6 100755
--- a/tests/nvme/052
+++ b/tests/nvme/052
@@ -30,7 +30,7 @@ test() {
 
 	_nvmet_target_setup --blkdev none
 
-	_nvme_connect_subsys
+	_nvme_connect_subsys --no-wait-ns
 
 	for ((i = 1; i <= iterations; i++)); do
 		nsid=$((def_nsid + i - 1))
diff --git a/tests/nvme/057 b/tests/nvme/057
index 525193c..db011bc 100755
--- a/tests/nvme/057
+++ b/tests/nvme/057
@@ -65,7 +65,7 @@ test() {
 	failback "${ports[@]}"
 
 	for port in "${ports[@]}"; do
-		_nvme_connect_subsys --port "${port}"
+		_nvme_connect_subsys --port "${port}" --no-wait-ns
 	done
 
 	# start fio job
diff --git a/tests/nvme/058 b/tests/nvme/058
index c230045..997ff7f 100755
--- a/tests/nvme/058
+++ b/tests/nvme/058
@@ -81,7 +81,7 @@ test() {
 	_setup_ana "${ports[@]}"
 
 	for port in "${ports[@]}"; do
-		_nvme_connect_subsys --port "${port}"
+		_nvme_connect_subsys --port "${port}" --no-wait-ns
 	done
 
 	# Simulate unmap on one cluster node and remap to anther one
diff --git a/tests/nvme/060 b/tests/nvme/060
index 87315c0..997512d 100755
--- a/tests/nvme/060
+++ b/tests/nvme/060
@@ -51,7 +51,7 @@ test() {
 	# The target reset is triggered with an even number timeout, while the
 	# host reconnects with an odd number timeout.
 	for ((i = 0; i <= 5; i++)); do
-		_nvme_connect_subsys --keep-alive-tmo 1 --reconnect-delay 1
+		_nvme_connect_subsys --keep-alive-tmo 1 --reconnect-delay 1 --no-wait-ns
 		sleep 3
 		_nvme_disconnect_subsys >> "$FULL" 2>&1
 	done
diff --git a/tests/nvme/062 b/tests/nvme/062
index d7424ac..7c88719 100755
--- a/tests/nvme/062
+++ b/tests/nvme/062
@@ -72,7 +72,7 @@ test() {
 
 	# Test unencrypted connection
 	echo "Test unencrypted connection w/ tls required (should fail)"
-	_nvme_connect_subsys
+	_nvme_connect_subsys --no-wait
 
 	_nvme_disconnect_subsys
 
-- 
2.45.1