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

ut/nvme: add coverage for spdk_nvme_detach()

Browse Source 
Change-Id: I222b0483d6b2b804ece87f2d2694f07770c885c5
Signed-off-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/372549
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Paul Luse 2017-08-03 10:06:14 -07:00 committed by Daniel Verkamp
parent 56799c8d9b
commit 85e26192d8
1 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
test/unit/lib/nvme/nvme.c/nvme_ut.c
View File

@ -41,8 +41,6 @@
#include "spdk_internal/mock.h" #include "spdk_internal/mock.h"
DEFINE_STUB_V(nvme_ctrlr_destruct, (struct spdk_nvme_ctrlr *ctrlr))
DEFINE_STUB_V(nvme_ctrlr_fail, DEFINE_STUB_V(nvme_ctrlr_fail,
(struct spdk_nvme_ctrlr *ctrlr, bool hot_remove)) (struct spdk_nvme_ctrlr *ctrlr, bool hot_remove))
@ -95,6 +93,13 @@ DEFINE_STUB_P(nvme_transport_ctrlr_construct, struct spdk_nvme_ctrlr,
const struct spdk_nvme_ctrlr_opts *opts, const struct spdk_nvme_ctrlr_opts *opts,
void *devhandle), {0}) void *devhandle), {0})
static bool ut_destruct_called = false;
void
nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr)
{
ut_destruct_called = true;
}
void void
spdk_nvme_ctrlr_opts_set_defaults(struct spdk_nvme_ctrlr_opts *opts) spdk_nvme_ctrlr_opts_set_defaults(struct spdk_nvme_ctrlr_opts *opts)
{ {
@ -108,6 +113,50 @@ memset_trid(struct spdk_nvme_transport_id *trid1, struct spdk_nvme_transport_id
memset(trid2, 0, sizeof(struct spdk_nvme_transport_id)); memset(trid2, 0, sizeof(struct spdk_nvme_transport_id));
} }
static void
test_spdk_nvme_detach(void)
{
int rc = 1;
struct spdk_nvme_ctrlr ctrlr;
struct spdk_nvme_ctrlr *ret_ctrlr;
struct nvme_driver test_driver;
g_spdk_nvme_driver = &test_driver;
TAILQ_INIT(&test_driver.attached_ctrlrs);
TAILQ_INSERT_TAIL(&test_driver.attached_ctrlrs, &ctrlr, tailq);
CU_ASSERT_FATAL(pthread_mutex_init(&test_driver.lock, NULL) == 0);
/*
* Controllers are ref counted so mock the function that returns
* the ref count so that detach will actually call the destruct
* function which we've mocked simply to verify that it gets
* called (we aren't testing what the real destuct function does
* here.)
*/
MOCK_SET(nvme_ctrlr_get_ref_count, int, 0);
rc = spdk_nvme_detach(&ctrlr);
ret_ctrlr = TAILQ_FIRST(&test_driver.attached_ctrlrs);
CU_ASSERT(ret_ctrlr == NULL);
CU_ASSERT(ut_destruct_called == true);
CU_ASSERT(rc == 0);
/*
* Mock the ref count to 1 so we confirm that the destruct
* function is not called and that attached ctrl list is
* not empty.
*/
MOCK_SET(nvme_ctrlr_get_ref_count, int, 1);
TAILQ_INSERT_TAIL(&test_driver.attached_ctrlrs, &ctrlr, tailq);
ut_destruct_called = false;
rc = spdk_nvme_detach(&ctrlr);
ret_ctrlr = TAILQ_FIRST(&test_driver.attached_ctrlrs);
CU_ASSERT(ret_ctrlr != NULL);
CU_ASSERT(ut_destruct_called == false);
CU_ASSERT(rc == 0);
g_spdk_nvme_driver = NULL;
}
static void static void
test_nvme_completion_poll_cb(void) test_nvme_completion_poll_cb(void)
{ {
@ -690,6 +739,8 @@ int main(int argc, char **argv)
test_trid_adrfam_str) == NULL || test_trid_adrfam_str) == NULL ||
CU_add_test(suite, "test_nvme_ctrlr_probe", CU_add_test(suite, "test_nvme_ctrlr_probe",
test_nvme_ctrlr_probe) == NULL || test_nvme_ctrlr_probe) == NULL ||
CU_add_test(suite, "test_spdk_nvme_detach",
test_spdk_nvme_detach) == NULL ||
CU_add_test(suite, "test_nvme_completion_poll_cb", CU_add_test(suite, "test_nvme_completion_poll_cb",
test_nvme_completion_poll_cb) == NULL || test_nvme_completion_poll_cb) == NULL ||
CU_add_test(suite, "test_nvme_user_copy_cmd_complete", CU_add_test(suite, "test_nvme_user_copy_cmd_complete",