Commit 75a12cbf authored by Slawomir Ptak's avatar Slawomir Ptak Committed by Konrad Sztyber
Browse files

test: Comparison operator fixes



Change-Id: I1296b19b590c2c6cbb75b9362e441cd6219d7a9f
Signed-off-by: default avatarSlawomir Ptak <slawomir.ptak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25198


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent f999d891
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ test_setup_compress_mbuf(void)
	rc = _setup_compress_mbuf(exp_src_mbuf, &src_mbuf_added, &total_length,
				  &src_iovs, src_iovcnt, &task);
	CU_ASSERT(rc == 0);
	CU_ASSERT(total_length = src_iovs.iov_len);
	CU_ASSERT(total_length == src_iovs.iov_len);
	CU_ASSERT(src_mbuf_added == 0);
	CU_ASSERT(ut_total_rte_pktmbuf_attach_extbuf == 1);

@@ -827,7 +827,7 @@ test_setup_compress_mbuf(void)
	rc = _setup_compress_mbuf(exp_src_mbuf, &src_mbuf_added, &total_length,
				  &src_iovs, src_iovcnt, &task);
	CU_ASSERT(rc == 0);
	CU_ASSERT(total_length = src_iovs.iov_len);
	CU_ASSERT(total_length == src_iovs.iov_len);
	CU_ASSERT(src_mbuf_added == 0);
	CU_ASSERT(ut_total_rte_pktmbuf_attach_extbuf == 2);

@@ -844,7 +844,7 @@ test_setup_compress_mbuf(void)
	rc = _setup_compress_mbuf(exp_src_mbuf, &src_mbuf_added, &total_length,
				  &src_iovs, src_iovcnt, &task);
	CU_ASSERT(rc == 0);
	CU_ASSERT(total_length = src_iovs.iov_len);
	CU_ASSERT(total_length == src_iovs.iov_len);
	CU_ASSERT(src_mbuf_added == 0);
	CU_ASSERT(ut_total_rte_pktmbuf_attach_extbuf == 3);

+4 −4
Original line number Diff line number Diff line
@@ -4687,7 +4687,7 @@ test_retry_io_if_ana_state_is_updating(void)

	poll_threads();
	CU_ASSERT(bdev_io1->internal.f.in_submit_request == false);
	CU_ASSERT(bdev_io1->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(bdev_io1->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);

	/* If ANA state of namespace is inaccessible, I/O should be queued. */
	nvme_ns->ana_state = SPDK_NVME_ANA_INACCESSIBLE_STATE;
@@ -5522,7 +5522,7 @@ test_retry_io_if_ctrlr_is_resetting(void)

	poll_threads();
	CU_ASSERT(bdev_io1->internal.f.in_submit_request == false);
	CU_ASSERT(bdev_io1->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(bdev_io1->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);

	/* If qpair is disconnected, it is freed and then reconnected via resetting
	 * the corresponding nvme_ctrlr. I/O should be queued if it is submitted
@@ -6861,7 +6861,7 @@ test_retry_io_to_same_path(void)

	poll_threads();
	CU_ASSERT(bdev_io->internal.f.in_submit_request == false);
	CU_ASSERT(bdev_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);

	/* The 2nd I/O should be submitted to io_path2 because the path selection
	 * policy is round-robin.
@@ -6945,7 +6945,7 @@ test_retry_io_to_same_path(void)

	/* The 2nd I/O should succeed by io_path1. */
	CU_ASSERT(bdev_io->internal.f.in_submit_request == false);
	CU_ASSERT(bdev_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(bio->io_path == io_path1);

	free(bdev_io);
+4 −4
Original line number Diff line number Diff line
@@ -1738,19 +1738,19 @@ ut_lvol_read_write(void)
	g_io->u.bdev.num_blocks = 20;

	lvol_read(g_ch, g_io);
	CU_ASSERT(g_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);

	lvol_write(g_lvol, g_ch, g_io);
	CU_ASSERT(g_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);

	g_ext_api_called = false;
	lvol_read(g_ch, g_io);
	CU_ASSERT(g_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_ext_api_called == true);
	g_ext_api_called = false;

	lvol_write(g_lvol, g_ch, g_io);
	CU_ASSERT(g_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);
	CU_ASSERT(g_ext_api_called == true);
	g_ext_api_called = false;

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ blob_rw_verify_iov_nomem(void)
	req_count = bs_channel_get_req_count(channel);
	spdk_blob_io_writev(blob, channel, iov_write, 3, 250, 10, blob_op_complete, NULL);
	poll_threads();
	CU_ASSERT(g_bserrno = -ENOMEM);
	CU_ASSERT(g_bserrno == -ENOMEM);
	CU_ASSERT(req_count == bs_channel_get_req_count(channel));
	MOCK_CLEAR(calloc);

+1 −1
Original line number Diff line number Diff line
@@ -2368,7 +2368,7 @@ test_spdk_nvme_ctrlr_set_trid(void)
	ctrlr.is_failed = true;
	new_trid.trtype = SPDK_NVME_TRANSPORT_TCP;
	CU_ASSERT(spdk_nvme_ctrlr_set_trid(&ctrlr, &new_trid) == -EINVAL);
	CU_ASSERT(ctrlr.trid.trtype = SPDK_NVME_TRANSPORT_RDMA);
	CU_ASSERT(ctrlr.trid.trtype == SPDK_NVME_TRANSPORT_RDMA);

	new_trid.trtype = SPDK_NVME_TRANSPORT_RDMA;
	snprintf(new_trid.subnqn, SPDK_NVMF_NQN_MAX_LEN, "%s", "nqn.2016-06.io.spdk:cnode2");
Loading