nvme/033: Remove volatile output

The output of _nvme_discover() will be changed according to
${nvme_trtype} and the number of NICs. For example: nvme/033
with nvme_trtype=tcp and two NICs got the following error:
------------------------------------------------
 Running nvme/033
-Discovery Log Number of Records 1, Generation counter X
+Discovery Log Number of Records 2, Generation counter X
 =====Discovery Log Entry 0======
-trtype:  loop
+trtype:  tcp
+subnqn:  nqn.2014-08.org.nvmexpress.discovery
+=====Discovery Log Entry 1======
+trtype:  tcp
 subnqn:  blktests-subsystem-1
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete
------------------------------------------------

Remove volatile output to fix the issue.

Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/033 b/tests/nvme/033
index c6a3f7feb50ea0002b7581ae0ac40cdbb0b2a429..90aee817de5d6bd2ea0ea48b4994f13ed04e0a6e 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -54,8 +54,6 @@ test_device() {
        _setup_nvmet
        port=$(_nvmet_passthru_target_setup "${subsys}")
 
-       _nvme_discover "${nvme_trtype}" | _filter_discovery
-
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
 
        compare_dev_info "${nsdev}"

diff --git a/tests/nvme/033.out b/tests/nvme/033.out
index 6f45a1d5ec1d205c4c9465c078a16ad535b9ad3f..eb508be65a5d458929cb0b7eb1f87adc8ec5d518 100644 (file)
--- a/tests/nvme/033.out
+++ b/tests/nvme/033.out
@@ -1,7 +1,3 @@
 Running nvme/033
-Discovery Log Number of Records 1, Generation counter X
-=====Discovery Log Entry 0======
-trtype:  loop
-subnqn:  blktests-subsystem-1
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete