ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ut/vbdev_lvol: simplify checking lvs examine results

Browse Source 
Change-Id: I0d20bf12a5abce89b7582df57e4e33a34cabb610
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/419559
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Tomasz Zawadzki 2018-07-17 07:56:41 -04:00 committed by Ben Walker
parent 8ed35e417d
commit 501280b24e
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
View File

@ -938,6 +938,27 @@ ut_lvol_hotremove(void)
} }
static void
ut_lvs_examine_check(bool success)
{
struct lvol_store_bdev *lvs_bdev;
/* Examine was finished regardless of result */
CU_ASSERT(g_examine_done == true);
g_examine_done = false;
if (success) {
SPDK_CU_ASSERT_FATAL(!TAILQ_EMPTY(&g_spdk_lvol_pairs));
lvs_bdev = TAILQ_FIRST(&g_spdk_lvol_pairs);
SPDK_CU_ASSERT_FATAL(lvs_bdev != NULL);
g_lvol_store = lvs_bdev->lvs;
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
} else {
SPDK_CU_ASSERT_FATAL(TAILQ_EMPTY(&g_spdk_lvol_pairs));
g_lvol_store = NULL;
}
}
static void static void
ut_lvol_examine(void) ut_lvol_examine(void)
{ {
@ -946,28 +967,22 @@ ut_lvol_examine(void)
lvol_already_opened = false; lvol_already_opened = false;
g_bs_dev = NULL; g_bs_dev = NULL;
g_lvserrno = 0; g_lvserrno = 0;
g_examine_done = false;
/* Examine unsuccessfully - bdev already opened */ /* Examine unsuccessfully - bdev already opened */
g_bs_dev = NULL; g_bs_dev = NULL;
g_examine_done = false;
g_lvserrno = -1; g_lvserrno = -1;
lvol_already_opened = true; lvol_already_opened = true;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(false);
CU_ASSERT(g_bs_dev == NULL); CU_ASSERT(g_bs_dev == NULL);
CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_examine_done == true);
/* Examine unsuccessfully - fail on lvol store */ /* Examine unsuccessfully - fail on lvol store */
g_bs_dev = NULL; g_bs_dev = NULL;
g_examine_done = false;
g_lvserrno = -1; g_lvserrno = -1;
lvol_already_opened = false; lvol_already_opened = false;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(false);
CU_ASSERT(g_bs_dev == NULL); CU_ASSERT(g_bs_dev == NULL);
CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_examine_done == true);
CU_ASSERT(TAILQ_EMPTY(&g_spdk_lvol_pairs));
/* Examine succesfully /* Examine succesfully
* - one lvol fails to load * - one lvol fails to load
@ -976,15 +991,12 @@ ut_lvol_examine(void)
g_lvserrno = 0; g_lvserrno = 0;
g_lvolerrno = -1; g_lvolerrno = -1;
g_num_lvols = 1; g_num_lvols = 1;
g_examine_done = false;
lvol_already_opened = false; lvol_already_opened = false;
g_registered_bdevs = 0; g_registered_bdevs = 0;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(true);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_bs_dev != NULL);
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_examine_done == true);
CU_ASSERT(g_registered_bdevs == 0); CU_ASSERT(g_registered_bdevs == 0);
CU_ASSERT(!TAILQ_EMPTY(&g_spdk_lvol_pairs));
CU_ASSERT(TAILQ_EMPTY(&g_lvol_store->lvols)); CU_ASSERT(TAILQ_EMPTY(&g_lvol_store->lvols));
vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL); vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
@ -1006,15 +1018,12 @@ ut_lvol_examine(void)
g_bs_dev = NULL; g_bs_dev = NULL;
g_lvserrno = 0; g_lvserrno = 0;
g_lvolerrno = 0; g_lvolerrno = 0;
g_examine_done = false;
g_registered_bdevs = 0; g_registered_bdevs = 0;
lvol_already_opened = false; lvol_already_opened = false;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(true);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_bs_dev != NULL);
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_examine_done == true);
CU_ASSERT(g_registered_bdevs != 0); CU_ASSERT(g_registered_bdevs != 0);
CU_ASSERT(!TAILQ_EMPTY(&g_spdk_lvol_pairs));
SPDK_CU_ASSERT_FATAL(!TAILQ_EMPTY(&g_lvol_store->lvols)); SPDK_CU_ASSERT_FATAL(!TAILQ_EMPTY(&g_lvol_store->lvols));
TAILQ_FIRST(&g_lvol_store->lvols)->ref_count--; TAILQ_FIRST(&g_lvol_store->lvols)->ref_count--;
bdev = TAILQ_FIRST(&g_lvol_store->lvols)->bdev; bdev = TAILQ_FIRST(&g_lvol_store->lvols)->bdev;