From: Hannes Reinecke <hare@xxxxxxx>
The subsystem NQN might be changed from the default value, but
that shouldn't cause the tests to fail. So don't register the
subsystem NQN in the 'out' files to avoid a false positive.
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
[Shin'ichiro: remove only subsystem NQN from nvme disconnect message]
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
---
tests/nvme/003.out | 2 +-
tests/nvme/004.out | 2 +-
tests/nvme/008.out | 2 +-
tests/nvme/009.out | 2 +-
tests/nvme/010.out | 2 +-
tests/nvme/011.out | 2 +-
tests/nvme/012.out | 2 +-
tests/nvme/013.out | 2 +-
tests/nvme/014.out | 2 +-
tests/nvme/015.out | 2 +-
tests/nvme/018.out | 2 +-
tests/nvme/019.out | 2 +-
tests/nvme/020.out | 2 +-
tests/nvme/033.out | 2 +-
tests/nvme/034.out | 2 +-
tests/nvme/035.out | 2 +-
tests/nvme/036.out | 2 +-
tests/nvme/041.out | 4 ++--
tests/nvme/042.out | 14 +++++++-------
tests/nvme/043.out | 16 ++++++++--------
tests/nvme/044.out | 8 ++++----
tests/nvme/045.out | 2 +-
tests/nvme/048.out | 2 +-
tests/nvme/rc | 3 ++-
24 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/tests/nvme/003.out b/tests/nvme/003.out
index beb3561..dc45bc4 100644
--- a/tests/nvme/003.out
+++ b/tests/nvme/003.out
@@ -1,3 +1,3 @@
Running nvme/003
-NQN:nqn.2014-08.org.nvmexpress.discovery disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/004.out b/tests/nvme/004.out
index 2559905..177185d 100644
--- a/tests/nvme/004.out
+++ b/tests/nvme/004.out
@@ -1,3 +1,3 @@
Running nvme/004
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/008.out b/tests/nvme/008.out
index 62342e7..f7411f8 100644
--- a/tests/nvme/008.out
+++ b/tests/nvme/008.out
@@ -1,3 +1,3 @@
Running nvme/008
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/009.out b/tests/nvme/009.out
index 853663f..4d53a8e 100644
--- a/tests/nvme/009.out
+++ b/tests/nvme/009.out
@@ -1,3 +1,3 @@
Running nvme/009
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/010.out b/tests/nvme/010.out
index 90468f5..18b52d8 100644
--- a/tests/nvme/010.out
+++ b/tests/nvme/010.out
@@ -1,3 +1,3 @@
Running nvme/010
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/011.out b/tests/nvme/011.out
index a780def..ebbb4f7 100644
--- a/tests/nvme/011.out
+++ b/tests/nvme/011.out
@@ -1,3 +1,3 @@
Running nvme/011
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/012.out b/tests/nvme/012.out
index ec4bea8..5074d3b 100644
--- a/tests/nvme/012.out
+++ b/tests/nvme/012.out
@@ -1,3 +1,3 @@
Running nvme/012
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/013.out b/tests/nvme/013.out
index 10b78ec..a727170 100644
--- a/tests/nvme/013.out
+++ b/tests/nvme/013.out
@@ -1,3 +1,3 @@
Running nvme/013
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/014.out b/tests/nvme/014.out
index c431864..a6f98a3 100644
--- a/tests/nvme/014.out
+++ b/tests/nvme/014.out
@@ -1,4 +1,4 @@
Running nvme/014
NVMe Flush: success
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/015.out b/tests/nvme/015.out
index 829cf40..f854f0b 100644
--- a/tests/nvme/015.out
+++ b/tests/nvme/015.out
@@ -1,4 +1,4 @@
Running nvme/015
NVMe Flush: success
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/018.out b/tests/nvme/018.out
index 6b0e814..94b937a 100644
--- a/tests/nvme/018.out
+++ b/tests/nvme/018.out
@@ -1,3 +1,3 @@
Running nvme/018
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/019.out b/tests/nvme/019.out
index a52325f..710f15a 100644
--- a/tests/nvme/019.out
+++ b/tests/nvme/019.out
@@ -1,4 +1,4 @@
Running nvme/019
NVMe DSM: success
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/020.out b/tests/nvme/020.out
index 9e293ab..61be280 100644
--- a/tests/nvme/020.out
+++ b/tests/nvme/020.out
@@ -1,4 +1,4 @@
Running nvme/020
NVMe DSM: success
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/033.out b/tests/nvme/033.out
index eb508be..c9614cc 100644
--- a/tests/nvme/033.out
+++ b/tests/nvme/033.out
@@ -1,3 +1,3 @@
Running nvme/033
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/034.out b/tests/nvme/034.out
index 0a7bd2f..e342d97 100644
--- a/tests/nvme/034.out
+++ b/tests/nvme/034.out
@@ -1,3 +1,3 @@
Running nvme/034
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/035.out b/tests/nvme/035.out
index a602713..8cbdea4 100644
--- a/tests/nvme/035.out
+++ b/tests/nvme/035.out
@@ -1,3 +1,3 @@
Running nvme/035
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/036.out b/tests/nvme/036.out
index d294f86..c14b0e1 100644
--- a/tests/nvme/036.out
+++ b/tests/nvme/036.out
@@ -1,3 +1,3 @@
Running nvme/036
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/041.out b/tests/nvme/041.out
index efee74c..1d0a5cd 100644
--- a/tests/nvme/041.out
+++ b/tests/nvme/041.out
@@ -1,6 +1,6 @@
Running nvme/041
Test unauthenticated connection (should fail)
-NQN:blktests-subsystem-1 disconnected 0 controller(s)
+disconnected 0 controller(s)
Test authenticated connection
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/042.out b/tests/nvme/042.out
index 7d3d21a..e042095 100644
--- a/tests/nvme/042.out
+++ b/tests/nvme/042.out
@@ -1,16 +1,16 @@
Running nvme/042
Testing hmac 0
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing hmac 1
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing hmac 2
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing hmac 3
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing key length 32
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing key length 48
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing key length 64
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/043.out b/tests/nvme/043.out
index 7419f91..a4a9a66 100644
--- a/tests/nvme/043.out
+++ b/tests/nvme/043.out
@@ -1,18 +1,18 @@
Running nvme/043
Testing hash hmac(sha256)
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing hash hmac(sha384)
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing hash hmac(sha512)
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing DH group ffdhe2048
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing DH group ffdhe3072
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing DH group ffdhe4096
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing DH group ffdhe6144
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Testing DH group ffdhe8192
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/044.out b/tests/nvme/044.out
index 53fdbe1..58f296d 100644
--- a/tests/nvme/044.out
+++ b/tests/nvme/044.out
@@ -1,10 +1,10 @@
Running nvme/044
Test host authentication
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test invalid ctrl authentication (should fail)
-NQN:blktests-subsystem-1 disconnected 0 controller(s)
+disconnected 0 controller(s)
Test valid ctrl authentication
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test invalid ctrl key (should fail)
-NQN:blktests-subsystem-1 disconnected 0 controller(s)
+disconnected 0 controller(s)
Test complete
diff --git a/tests/nvme/045.out b/tests/nvme/045.out
index 48f7e6b..84a69ef 100644
--- a/tests/nvme/045.out
+++ b/tests/nvme/045.out
@@ -8,5 +8,5 @@ Change DH group to ffdhe8192
Re-authenticate with changed DH group
Change hash to hmac(sha512)
Re-authenticate with changed hash
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/048.out b/tests/nvme/048.out
index 7f986ef..c1c0979 100644
--- a/tests/nvme/048.out
+++ b/tests/nvme/048.out
@@ -1,3 +1,3 @@
Running nvme/048
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
+disconnected 1 controller(s)
Test complete
diff --git a/tests/nvme/rc b/tests/nvme/rc
index 4452274..34a144f 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -430,7 +430,8 @@ _nvme_disconnect_ctrl() {
_nvme_disconnect_subsys() {
local subsysnqn="$1"
- nvme disconnect -n "${subsysnqn}"
+ nvme disconnect -n "${subsysnqn}" |& tee -a "$FULL" |
+ grep -o "disconnected.*"
}
_nvme_connect_subsys() {
--
2.41.0
