The previous commit introduced "udevadm settle" command at the end of
_nvme_connect_subsys. Then the command is no longer required after
calling _nvme_connect_subsys in test cases.
Reviewed-by: Daniel Wagner <dwagner@xxxxxxx>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
---
Changes from v2:
* Added Reviewed-by tag
tests/nvme/005 | 2 --
tests/nvme/008 | 2 --
tests/nvme/009 | 2 --
tests/nvme/040 | 1 -
tests/nvme/041 | 2 --
tests/nvme/042 | 3 ---
tests/nvme/043 | 4 ----
tests/nvme/044 | 8 --------
tests/nvme/045 | 2 --
9 files changed, 26 deletions(-)
diff --git a/tests/nvme/005 b/tests/nvme/005
index 6646b82..4ca87ff 100755
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -40,8 +40,6 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
- udevadm settle
-
echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
_nvme_disconnect_ctrl "${nvmedev}"
diff --git a/tests/nvme/008 b/tests/nvme/008
index 3921fc6..bd5e10f 100755
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -40,8 +40,6 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
diff --git a/tests/nvme/009 b/tests/nvme/009
index aac3c1e..c9a4b57 100755
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -36,8 +36,6 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
diff --git a/tests/nvme/040 b/tests/nvme/040
index 1a9be5c..ed6df3b 100755
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -35,7 +35,6 @@ test() {
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
- udevadm settle
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
# start fio job
diff --git a/tests/nvme/041 b/tests/nvme/041
index cb27666..bc84412 100755
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -57,8 +57,6 @@ test() {
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
diff --git a/tests/nvme/042 b/tests/nvme/042
index 9180fce..47e1b95 100755
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -50,7 +50,6 @@ test() {
--hostnqn "${def_hostnqn}" \
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
_nvme_disconnect_subsys "${def_subsysnqn}"
done
@@ -69,8 +68,6 @@ test() {
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
done
diff --git a/tests/nvme/043 b/tests/nvme/043
index f084229..15676f8 100755
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -55,8 +55,6 @@ test() {
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
done
@@ -71,8 +69,6 @@ test() {
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
done
diff --git a/tests/nvme/044 b/tests/nvme/044
index 5eb163d..9407ac6 100755
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -59,8 +59,6 @@ test() {
--hostid "${def_hostid}" \
--dhchap-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
# Step 2: Connect with host authentication
@@ -72,8 +70,6 @@ test() {
--dhchap-secret "${hostkey}" \
--dhchap-ctrl-secret "${hostkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
# Step 3: Connect with host authentication
@@ -85,8 +81,6 @@ test() {
--dhchap-secret "${hostkey}" \
--dhchap-ctrl-secret "${ctrlkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
# Step 4: Connect with host authentication
@@ -99,8 +93,6 @@ test() {
--dhchap-secret "${hostkey}" \
--dhchap-ctrl-secret "${invkey}"
- udevadm settle
-
_nvme_disconnect_subsys "${def_subsysnqn}"
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
diff --git a/tests/nvme/045 b/tests/nvme/045
index 8364d5e..396bcde 100755
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -61,8 +61,6 @@ test() {
--dhchap-secret "${hostkey}" \
--dhchap-ctrl-secret "${ctrlkey}"
- udevadm settle
-
echo "Re-authenticate with original host key"
ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
--
2.40.1
