From 62d14e2ca1ccc1af0a6bd9cf93eb61f5d247e24f Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 9 Dec 2019 22:02:30 -0500 Subject: [PATCH] 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: Shuhei Matsumoto Change-Id: Idde4726bfe370ad742b2de67e0786aebb7237d45 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477409 Tested-by: SPDK CI Jenkins Community-CI: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- test/unit/lib/iscsi/iscsi.c/iscsi_ut.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c index 58097cea1..953f28bae 100644 --- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c +++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c @@ -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));