TESTS: move the default url, lun and iscsi context into a structure
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
@@ -47,14 +47,14 @@ test_orwrite_verify(void)
|
||||
|
||||
logging(LOG_VERBOSE, "Write %d blocks of all-zero", i);
|
||||
memset(buf, 0, block_size * i);
|
||||
ret = write10(iscsic, tgt_lun, 0, i * block_size,
|
||||
ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i);
|
||||
memset(buf, 0xa5, block_size * i);
|
||||
ret = orwrite(iscsic, tgt_lun, 0, i * block_size,
|
||||
ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
if (ret == -2) {
|
||||
@@ -65,7 +65,7 @@ test_orwrite_verify(void)
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Read %d blocks back", i);
|
||||
ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size,
|
||||
ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, readbuf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
@@ -76,13 +76,13 @@ test_orwrite_verify(void)
|
||||
|
||||
logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i);
|
||||
memset(buf, 0x5a, block_size * i);
|
||||
ret = orwrite(iscsic, tgt_lun, 0, i * block_size,
|
||||
ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Read %d blocks back", i);
|
||||
ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size,
|
||||
ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, readbuf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
@@ -101,20 +101,20 @@ test_orwrite_verify(void)
|
||||
|
||||
logging(LOG_VERBOSE, "Write %d blocks of all-zero", i);
|
||||
memset(buf, 0, block_size * i);
|
||||
ret = write16(iscsic, tgt_lun, num_blocks - i, i * block_size,
|
||||
ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i);
|
||||
memset(buf, 0xa5, block_size * i);
|
||||
ret = orwrite(iscsic, tgt_lun, num_blocks - i, i * block_size,
|
||||
ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Read %d blocks back", i);
|
||||
ret = read16(iscsic, tgt_lun, num_blocks - i, i * block_size,
|
||||
ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, readbuf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
@@ -125,13 +125,13 @@ test_orwrite_verify(void)
|
||||
|
||||
logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i);
|
||||
memset(buf, 0x5a, block_size * i);
|
||||
ret = orwrite(iscsic, tgt_lun, num_blocks - i, i * block_size,
|
||||
ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Read %d blocks back", i);
|
||||
ret = read16(iscsic, tgt_lun, num_blocks - i, i * block_size,
|
||||
ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, readbuf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
Reference in New Issue
Block a user