From fe648cb987b2748e35527a3e8b6bc8755599ec89 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 7 Feb 2023 17:13:49 +0100 Subject: [PATCH] test/spdkcli: Consider matching against nvme bdev's UUID Without it, this test fails under nvme ctrls which do report UUIDs for their namespaces. Signed-off-by: Michal Berger Change-Id: I8f0137f8ce57f44c49f1708c8599a52e8092c262 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16707 Reviewed-by: Tomasz Zawadzki Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- test/spdkcli/match_files/spdkcli_vhost.test.match | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spdkcli/match_files/spdkcli_vhost.test.match b/test/spdkcli/match_files/spdkcli_vhost.test.match index eed2e1f9c..faed2b99b 100644 --- a/test/spdkcli/match_files/spdkcli_vhost.test.match +++ b/test/spdkcli/match_files/spdkcli_vhost.test.match @@ -21,7 +21,8 @@ o- / ........................................................................... | | o- null_bdev0 $(S) [$(UUID), Size=$(FP)M, Not claimed] | | o- null_bdev1 $(S) [$(UUID), Size=$(FP)M, Not claimed] | o- nvme ............................................................................................................. [Bdevs: 1] - | | o- Nvme0n1 $(S) [Size=$(S), Claimed] +$(OPT) | | o- Nvme0n1 $(S) [Size=$(S), Claimed] +$(OPX) | | o- Nvme0n1 $(S) [$(UUID), Size=$(S), Claimed] | o- pmemblk .......................................................................................................... [Bdevs: 0] | o- raid_volume ...................................................................................................... [Bdevs: 0] | o- rbd .............................................................................................................. [Bdevs: 0]