[PATCH blktests] nvme/033: Remove volatile output

[PATCH blktests] nvme/033: Remove volatile output

[Xiao Yang]

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>
---
 tests/nvme/033     | 2 --
 tests/nvme/033.out | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/tests/nvme/033 b/tests/nvme/033
index c6a3f7f..90aee81 100755
--- 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 6f45a1d..eb508be 100644
--- 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
-- 
2.23.0

Re: [PATCH blktests] nvme/033: Remove volatile output

[Chaitanya Kulkarni]

On 6/4/22 09:06, Xiao Yang wrote:
> 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>
> ---
>   tests/nvme/033     | 2 --
>   tests/nvme/033.out | 4 ----
>   2 files changed, 6 deletions(-)
> 

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH blktests] nvme/033: Remove volatile output

[Shinichiro Kawasaki]

On Jun 05, 2022 / 00:06, Xiao Yang wrote:
> 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>

Thanks, applied!

-- 
Shin'ichiro Kawasaki