nvme/{016,017}: use _check_genctr instead of _filter_discovery

Since commit 328943e3 ("Update tests for discovery log page changes"),
blktests also include the discovery subsystem itself. But it
will lead these cases fails on older nvme-cli system.

To avoid this, like nvme/002, use _check_genctr to check instead of
comparing many discovery Log Entry output.

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/016 b/tests/nvme/016
index c0c31a55b19051dedebbd3f3ef83ca40840708b8..f617cf103900f4edf02d55f0567803ba54865795 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -24,6 +24,7 @@ test() {
        _setup_nvmet
 
        loop_dev="$(losetup -f)"
+       local genctr=1
 
        _create_nvmet_subsystem "${subsys_nqn}" "${loop_dev}"
 
@@ -34,7 +35,8 @@ test() {
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
 
-       _nvme_discover loop | _filter_discovery
+       genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port")
+
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}"
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/016.out b/tests/nvme/016.out
index ee631a497a54178b18c33fcff5641533d34199c9..fd244d509fb9ac0b2ab07cd4cddb3331a347828d 100644 (file)
--- a/tests/nvme/016.out
+++ b/tests/nvme/016.out
@@ -1,9 +1,2 @@
 Running nvme/016
-Discovery Log Number of Records 2, Generation counter X
-=====Discovery Log Entry 0======
-trtype:  loop
-subnqn:  nqn.2014-08.org.nvmexpress.discovery
-=====Discovery Log Entry 1======
-trtype:  loop
-subnqn:  blktests-subsystem-1
 Test complete

diff --git a/tests/nvme/017 b/tests/nvme/017
index e1674508f6543a1a08a66e44796937d52a3c912d..3dbb7c174b56f998a2d1252fe89a050d519230d8 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -27,6 +27,8 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
+       local genctr=1
+
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
 
@@ -37,7 +39,8 @@ test() {
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_discover loop | _filter_discovery
+       genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port")
+
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/017.out b/tests/nvme/017.out
index 12787f79cf4011b52bafde14f9f60f93dad25877..6ce9a80a6451064e1e194f41b6b5ac2fc0528de8 100644 (file)
--- a/tests/nvme/017.out
+++ b/tests/nvme/017.out
@@ -1,9 +1,2 @@
 Running nvme/017
-Discovery Log Number of Records 2, Generation counter X
-=====Discovery Log Entry 0======
-trtype:  loop
-subnqn:  nqn.2014-08.org.nvmexpress.discovery
-=====Discovery Log Entry 1======
-trtype:  loop
-subnqn:  blktests-subsystem-1
 Test complete