TESTS: update writesame tests to new API
Signed-off-by: Ronnie Sahlberg <sahlberg@localhost>
This commit is contained in:
committed by
Ronnie Sahlberg
parent
d3f98dfdd5
commit
8585e4509b
@@ -52,8 +52,8 @@ test_writesame16_unmap(void)
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
memset(buf, 0, block_size);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
if (ret == -2) {
|
||||
logging(LOG_NORMAL, "[SKIPPED] WRITESAME16 is not implemented.");
|
||||
CU_PASS("[SKIPPED] Target does not support WRITESAME16. Skipping test");
|
||||
@@ -91,8 +91,8 @@ test_writesame16_unmap(void)
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
memset(buf, 0, block_size);
|
||||
ret = writesame16(iscsic, tgt_lun, num_blocks - i,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
if (rc16->lbprz) {
|
||||
@@ -113,9 +113,9 @@ test_writesame16_unmap(void)
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that WRITESAME16 ANCHOR==1 + UNMAP==0 is invalid");
|
||||
ret = writesame16_invalidfieldincdb(iscsic, tgt_lun, 0,
|
||||
block_size, 1,
|
||||
1, 0, 0, 0, buf);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, 1, 1, 0, 0, 0, buf,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
|
||||
@@ -124,13 +124,13 @@ test_writesame16_unmap(void)
|
||||
logging(LOG_VERBOSE, "Test WRITESAME16 ANCHOR==1 + UNMAP==0");
|
||||
memset(buf, 0, block_size);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, 1,
|
||||
1, 1, 0, 0, buf);
|
||||
block_size, 1, 1, 1, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
} else {
|
||||
logging(LOG_VERBOSE, "Test WRITESAME16 ANCHOR==1 + UNMAP==0 no ANC_SUP so expecting to fail");
|
||||
ret = writesame16_invalidfieldincdb(iscsic, tgt_lun, 0,
|
||||
block_size, 1,
|
||||
1, 1, 0, 0, buf);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, 1, 1, 1, 0, 0, buf,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
}
|
||||
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
@@ -162,8 +162,8 @@ test_writesame16_unmap(void)
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
memset(buf, 0, block_size);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
if (rc16->lbprz) {
|
||||
@@ -188,9 +188,9 @@ test_writesame16_unmap(void)
|
||||
"INVALID_FIELD_IN_CDB.");
|
||||
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
ret = writesame16_invalidfieldincdb(iscsic, tgt_lun, 0,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
}
|
||||
|
||||
@@ -213,8 +213,8 @@ test_writesame16_unmap(void)
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
memset(buf, 0, block_size);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
if (rc16->lbprz) {
|
||||
@@ -239,9 +239,9 @@ test_writesame16_unmap(void)
|
||||
"INVALID_FIELD_IN_CDB.");
|
||||
|
||||
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
|
||||
ret = writesame16_invalidfieldincdb(iscsic, tgt_lun, 0,
|
||||
block_size, i,
|
||||
0, 1, 0, 0, buf);
|
||||
ret = writesame16(iscsic, tgt_lun, 0,
|
||||
block_size, i, 0, 1, 0, 0, buf,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user