Commit 62d14e2c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

ut/iscsi: Re-order operations in abort_queued_datain_task_test() 



Re-order operations in abort_queued_datain_task_test() to align it
with comment, and fix a type error.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Idde4726bfe370ad742b2de67e0786aebb7237d45
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477409


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 19eb63fc

test/unit/lib/iscsi/iscsi.c/iscsi_ut.c

+6 −8
Original line number Diff line number Diff line
@@ -1109,23 +1109,22 @@ abort_queued_datain_task_test(void) 
	int rc;



	TAILQ_INIT(&conn.queued_datain_tasks);



	/* Case1: Queue one task, and this task is not executed */

	task = spdk_iscsi_task_get(&conn, NULL, NULL);

	SPDK_CU_ASSERT_FATAL(task != NULL);

	task->scsi.dxfer_dir = SPDK_SCSI_DIR_FROM_DEV;



	/* No slots for sub read tasks */

	conn.data_in_cnt = MAX_LARGE_DATAIN_PER_CONNECTION;

	/* Case1: Queue one task, and this task is not executed */

	task->scsi.transfer_len = SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3;

	task->scsi.offset = 0;

	TAILQ_INSERT_TAIL(&conn.queued_datain_tasks, task, link);



	/* No slots for sub read tasks */

	conn.data_in_cnt = MAX_LARGE_DATAIN_PER_CONNECTION;

	rc = _iscsi_conn_abort_queued_datain_task(&conn, task);

	CU_ASSERT(rc != 0);

	CU_ASSERT(!TAILQ_EMPTY(&conn.queued_datain_tasks));



	/* havs slots for sub read tasks */

	/* Have slots for sub read tasks */

	conn.data_in_cnt = 0;

	rc = _iscsi_conn_abort_queued_datain_task(&conn, task);

	CU_ASSERT(rc == 0);
@@ -1133,13 +1132,12 @@ abort_queued_datain_task_test(void) 
	CU_ASSERT(task->current_datain_offset == SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3);



	/* Case2: Queue one task, and this task is partially executed */



	/* No slots for sub read tasks */

	conn.data_in_cnt = MAX_LARGE_DATAIN_PER_CONNECTION;

	task->scsi.transfer_len = SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3;

	task->current_datain_offset = SPDK_BDEV_LARGE_BUF_MAX_SIZE;

	TAILQ_INSERT_TAIL(&conn.queued_datain_tasks, task, link);



	/* No slots for sub read tasks */

	conn.data_in_cnt = MAX_LARGE_DATAIN_PER_CONNECTION;

	rc = _iscsi_conn_abort_queued_datain_task(&conn, task);

	CU_ASSERT(rc != 0);

	CU_ASSERT(!TAILQ_EMPTY(&conn.queued_datain_tasks));