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

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

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

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Idde4726bfe370ad742b2de67e0786aebb7237d45
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477409
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-12-09 22:02:30 -05:00 committed by Tomasz Zawadzki
parent 19eb63fcad
commit 62d14e2ca1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
View File

@ -1109,23 +1109,22 @@ abort_queued_datain_task_test(void)
int rc; int rc;
TAILQ_INIT(&conn.queued_datain_tasks); TAILQ_INIT(&conn.queued_datain_tasks);
/* Case1: Queue one task, and this task is not executed */
task = spdk_iscsi_task_get(&conn, NULL, NULL); task = spdk_iscsi_task_get(&conn, NULL, NULL);
SPDK_CU_ASSERT_FATAL(task != NULL); SPDK_CU_ASSERT_FATAL(task != NULL);
task->scsi.dxfer_dir = SPDK_SCSI_DIR_FROM_DEV; task->scsi.dxfer_dir = SPDK_SCSI_DIR_FROM_DEV;
/* No slots for sub read tasks */ /* Case1: Queue one task, and this task is not executed */
conn.data_in_cnt = MAX_LARGE_DATAIN_PER_CONNECTION;
task->scsi.transfer_len = SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3; task->scsi.transfer_len = SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3;
task->scsi.offset = 0; task->scsi.offset = 0;
TAILQ_INSERT_TAIL(&conn.queued_datain_tasks, task, link); 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); rc = _iscsi_conn_abort_queued_datain_task(&conn, task);
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
CU_ASSERT(!TAILQ_EMPTY(&conn.queued_datain_tasks)); 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; conn.data_in_cnt = 0;
rc = _iscsi_conn_abort_queued_datain_task(&conn, task); rc = _iscsi_conn_abort_queued_datain_task(&conn, task);
CU_ASSERT(rc == 0); 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); CU_ASSERT(task->current_datain_offset == SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3);
/* Case2: Queue one task, and this task is partially executed */ /* 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->scsi.transfer_len = SPDK_BDEV_LARGE_BUF_MAX_SIZE * 3;
task->current_datain_offset = SPDK_BDEV_LARGE_BUF_MAX_SIZE; task->current_datain_offset = SPDK_BDEV_LARGE_BUF_MAX_SIZE;
TAILQ_INSERT_TAIL(&conn.queued_datain_tasks, task, link); 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); rc = _iscsi_conn_abort_queued_datain_task(&conn, task);
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
CU_ASSERT(!TAILQ_EMPTY(&conn.queued_datain_tasks)); CU_ASSERT(!TAILQ_EMPTY(&conn.queued_datain_tasks));