admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test-tool: Use block_size instead of hardcoded 512 bytes

Browse Source 
Fix another couple of tests that fail on 4Kn drives:

* iSCSI.iSCSITMF.AbortTaskSimpleAsync
* iSCSI.iSCSITMF.LUNResetSimpleAsync
This commit is contained in:
Consus
2020-08-10 15:51:54 +03:00
parent 0e9b29751c
commit 9e160e02b6
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test-tool/test_async_abort_simple.c
View File

@@ -92,7 +92,6 @@ test_async_abort_simple(void)
{ {
int ret; int ret;
struct tests_async_abort_state state = { NULL, 0, 0, 0, 0 }; struct tests_async_abort_state state = { NULL, 0, 0, 0, 0 };
int blocksize = 512;
int blocks_per_io = 8; int blocks_per_io = 8;
unsigned char *buf; unsigned char *buf;
uint64_t timeout_sec; uint64_t timeout_sec;
@@ -107,18 +106,18 @@ test_async_abort_simple(void)
return; return;
} }
buf = calloc(blocksize, blocks_per_io); buf = calloc(block_size, blocks_per_io);
CU_ASSERT(buf != NULL); CU_ASSERT(buf != NULL);
if (!buf) if (!buf)
return; return;
/* queue and dispatch write before the abort */ /* queue and dispatch write before the abort */
state.wtask = scsi_cdb_write10(0, blocks_per_io * blocksize, state.wtask = scsi_cdb_write10(0, blocks_per_io * block_size,
blocksize, 0, 0, 0, 0, 0); block_size, 0, 0, 0, 0, 0);
CU_ASSERT_PTR_NOT_NULL_FATAL(state.wtask); CU_ASSERT_PTR_NOT_NULL_FATAL(state.wtask);
ret = scsi_task_add_data_out_buffer(state.wtask, ret = scsi_task_add_data_out_buffer(state.wtask,
blocks_per_io * blocksize, blocks_per_io * block_size,
buf); buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);

9
test-tool/test_async_lu_reset_simple.c
View File

@@ -91,7 +91,6 @@ test_async_lu_reset_simple(void)
{ {
int ret; int ret;
struct tests_async_reset_state state = { NULL, 0, 0, 0, }; struct tests_async_reset_state state = { NULL, 0, 0, 0, };
int blocksize = 512;
int blocks_per_io = 8; int blocks_per_io = 8;
unsigned char *buf; unsigned char *buf;
uint64_t timeout_sec; uint64_t timeout_sec;
@@ -106,18 +105,18 @@ test_async_lu_reset_simple(void)
return; return;
} }
buf = calloc(blocksize, blocks_per_io); buf = calloc(block_size, blocks_per_io);
CU_ASSERT(buf != NULL); CU_ASSERT(buf != NULL);
if (!buf) if (!buf)
return; return;
/* queue and dispatch write before the reset */ /* queue and dispatch write before the reset */
state.wtask = scsi_cdb_write10(0, blocks_per_io * blocksize, state.wtask = scsi_cdb_write10(0, blocks_per_io * block_size,
blocksize, 0, 0, 0, 0, 0); block_size, 0, 0, 0, 0, 0);
CU_ASSERT_PTR_NOT_NULL_FATAL(state.wtask); CU_ASSERT_PTR_NOT_NULL_FATAL(state.wtask);
ret = scsi_task_add_data_out_buffer(state.wtask, ret = scsi_task_add_data_out_buffer(state.wtask,
blocks_per_io * blocksize, blocks_per_io * block_size,
buf); buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);