From 533fa01fab28fa9c8e35f0d71fe0fece29cea252 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 17 Apr 2020 06:40:49 -0400 Subject: [PATCH] test/cuse: verify proper device after unregister ${nvme_name} refers to device name when bound to kernel nvme driver. One of the checks modified by this patch would return true for case when original device name was anything other than "/dev/nvme0". Any higher number id would not exist in /dev/spdk path anyway. Meanwhile devices under /dev/spdk are created in order by the SPDK, so we are sure they will start from 0. This test only registers single nvme_cuse device so that would be the only one. So this patch replaces ${nvme_name} with hardcoded value of ctrlr="/dev/spdk/nvme0" as this is always the outcome of this test. Signed-off-by: Tomasz Zawadzki Change-Id: I521ebe68685234774e8b94175553c8c8609c0bd1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1919 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/nvme/spdk_nvme_cli_cuse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/nvme/spdk_nvme_cli_cuse.sh b/test/nvme/spdk_nvme_cli_cuse.sh index 18734aad7..53d24d6a6 100755 --- a/test/nvme/spdk_nvme_cli_cuse.sh +++ b/test/nvme/spdk_nvme_cli_cuse.sh @@ -106,7 +106,7 @@ fi $rpc_py bdev_nvme_cuse_unregister -n Nvme0 sleep 1 -if [ -c /dev/spdk/${nvme_name} ]; then +if [ -c "$ctrlr" ]; then return 1 fi @@ -119,7 +119,7 @@ fi $rpc_py bdev_nvme_detach_controller Nvme0 sleep 1 -if [ -c /dev/spdk/nvme0 ]; then +if [ -c "$ctrlr" ]; then return 1 fi