Commit 521bd911 authored by Maciej Szwed's avatar Maciej Szwed Committed by Ben Walker
Browse files

test/nvme: Allow NVMe with 0 namespaces in tests 



Some tests return error if no namespace is found,
but such scenario should be accepted.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: Icc799eac1ebc2d4f16017722da3c20d58788fb33
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459276


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 06f6c906

test/env/env_dpdk_post_init/env_dpdk_post_init.c

+1 −4
Original line number Diff line number Diff line
@@ -77,10 +77,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
	dev->ctrlr = ctrlr;

	nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);

	dev->ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

	if (dev->ns == NULL) {

		g_failed = 1;

		return;

	}



	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

	if (dev->qpair == NULL) {

		g_failed = 1;

test/nvme/err_injection/err_injection.c

+5 −4
Original line number Diff line number Diff line
@@ -82,10 +82,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
	dev->ctrlr = ctrlr;

	nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);

	dev->ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

	if (dev->ns == NULL) {

		failed = 1;

		return;

	}



	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

	if (dev->qpair == NULL) {

		failed = 1;
@@ -183,6 +180,10 @@ read_test(bool error_expected) 
	struct dev *dev;



	foreach_dev(dev) {

		if (dev->ns == NULL) {

			continue;

		}



		dev->error_expected = error_expected;

		dev->data = spdk_zmalloc(0x1000, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

		if (!dev->data) {