nvme: do not print subsystem NQN to stdout

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@suse.de>
[Shin'ichiro: remove only subsystem NQN from nvme disconnect message]
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/003.out b/tests/nvme/003.out
index beb356128c9d3f6ebea18de2c0365eecce60ea8c..dc45bc41962b33c456840f53186cc26ccf967f41 100644 (file)
--- 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 255990529c9d7385a619a18321fe31e488e990ae..177185d7fe62c543f38d9c6abac9a037b54e613c 100644 (file)
--- 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 62342e799d9b904cc217219d2bcefa62e5485c03..f7411f8accf99bae2d5bef1d08ead82f25a776dc 100644 (file)
--- 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 853663ff0f3094d1f1b5106844277b6bc4b20d46..4d53a8e8ab193b3fc73a08003e61ca0130cf497f 100644 (file)
--- 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 90468f5467b9f192f43f2c41d200964da7859230..18b52d83942d69372591cc9203863e13ba1b4216 100644 (file)
--- 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 a780def85e7157623fab11977d22e5b69584f6b0..ebbb4f7c65bf10436577962b69c71cbe69c0e1f0 100644 (file)
--- 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 ec4bea82bff85251377c331e6e97385564b1fc68..5074d3b254d0b6174576f8c957ff15334acce90e 100644 (file)
--- 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 10b78ece8cb10b3de177c1cd22409b6fec3aec9a..a7271700adfe5a5fb5796fc4b321b5f15c938093 100644 (file)
--- 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 c431864162df17d691866ddaa9c6abee76fa7e46..a6f98a392b3d5d8d7aba75b1ee34d6f78a15cfd4 100644 (file)
--- 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 829cf4082a3c92649fc9f55bdea9678e813fcf05..f854f0b52dc09e3b5eb1bb150f0ee82fafacfe11 100644 (file)
--- 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 6b0e8141b4e9c9b1024af9e86acf7bf6ada2105e..94b937a907fe1073a7ce450707bb25607070ae4d 100644 (file)
--- 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 a52325fac677cc93af9cf270d37923c9ac23db21..710f15aeaf2ed7b4f05ffc54707d64944f655dc9 100644 (file)
--- 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 9e293ab5453531e4fb8afb6495b447d4de109388..61be280a64cc58a07071fbbc9ae7407e9260e7ae 100644 (file)
--- 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 eb508be65a5d458929cb0b7eb1f87adc8ec5d518..c9614cccdf1efd405582eab67a59a59176389655 100644 (file)
--- 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 0a7bd2f90dae545c4a4764be597cbb0911f37e6d..e342d979ae5006023b8b7a8ef63c0946e0369892 100644 (file)
--- 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 a6027138fbe4df00fbf16b1f5e3aaae2a0059567..8cbdea4128c3c9bfd846b31de3312d481ffdb007 100644 (file)
--- 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 d294f8646b207e611347ecb250d32a3edfba88c5..c14b0e1e305bb9234e88a9d260795d69202aa040 100644 (file)
--- 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 efee74c893f296fc9c588a4f784cf181793e5bc7..1d0a5cdb286aefa7571d0b50c7225ea63f353a04 100644 (file)
--- 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 7d3d21a4c97da45c78da7cfdc43ec3e2e36545e5..e042095986b7048f1191843438bad74c1fc5d498 100644 (file)
--- 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 7419f913beeda4d4cc70063ca2113b616a5f424d..a4a9a66b88cec39e18393ee10ec127e6aa80c430 100644 (file)
--- 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 53fdbe127d68ef3a034d147e97b5729700d00de9..58f296dbdf53808fa59a5ecaf9acd5be6ca97981 100644 (file)
--- 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 48f7e6b3a3eaf993c1084b2f3c87cd61fd901c14..84a69ef5c4c6ba8130a83875eee17c1e7665e2c5 100644 (file)
--- 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 7f986ef9637d0bc33bec3db2835608724a8c58bf..c1c0979b56590c6eed03697d1e36d3bfb7276911 100644 (file)
--- 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 44522743caf9be975d030db4a1f71003c3b87f8a..34a144f40fd12fd4b99cc0d345d29f4e2b5984cf 100644 (file)
--- 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() {