TESTS: change write16 flags/wrprotect tests to also write one block of data

This commit is contained in:
Ronnie Sahlberg
2013-01-21 11:24:31 -08:00
parent 2f90e02395
commit 84c8606c90
2 changed files with 12 additions and 6 deletions

View File

@@ -29,6 +29,7 @@ void
test_write16_flags(void) test_write16_flags(void)
{ {
int ret; int ret;
unsigned char *buf;
logging(LOG_VERBOSE, ""); logging(LOG_VERBOSE, "");
logging(LOG_VERBOSE, "Test WRITE16 flags"); logging(LOG_VERBOSE, "Test WRITE16 flags");
@@ -44,37 +45,39 @@ test_write16_flags(void)
return; return;
} }
buf = malloc(block_size);
logging(LOG_VERBOSE, "Test WRITE16 with DPO==1"); logging(LOG_VERBOSE, "Test WRITE16 with DPO==1");
ret = write16(iscsic, tgt_lun, 0, ret = write16(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
0, 1, 0, 0, 0, NULL); 0, 1, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==0"); logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==0");
ret = write16(iscsic, tgt_lun, 0, ret = write16(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
0, 0, 1, 0, 0, NULL); 0, 0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==1"); logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==1");
ret = write16(iscsic, tgt_lun, 0, ret = write16(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
0, 0, 1, 1, 0, NULL); 0, 0, 1, 1, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITE16 with FUA==0 FUA_NV==1"); logging(LOG_VERBOSE, "Test WRITE16 with FUA==0 FUA_NV==1");
ret = write16(iscsic, tgt_lun, 0, ret = write16(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
0, 0, 0, 1, 0, NULL); 0, 0, 0, 1, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITE16 with DPO==1 FUA==1 FUA_NV==1"); logging(LOG_VERBOSE, "Test WRITE16 with DPO==1 FUA==1 FUA_NV==1");
ret = write16(iscsic, tgt_lun, 0, ret = write16(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
0, 1, 1, 1, 0, NULL); 0, 1, 1, 1, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
free(buf);
} }

View File

@@ -29,6 +29,7 @@ void
test_write16_wrprotect(void) test_write16_wrprotect(void)
{ {
int i, ret; int i, ret;
unsigned char *buf;
if (!data_loss) { if (!data_loss) {
CU_PASS("[SKIPPED] --dataloss flag is not set. Skipping test."); CU_PASS("[SKIPPED] --dataloss flag is not set. Skipping test.");
@@ -46,10 +47,12 @@ test_write16_wrprotect(void)
*/ */
logging(LOG_VERBOSE, ""); logging(LOG_VERBOSE, "");
logging(LOG_VERBOSE, "Test WRITE16 with non-zero WRPROTECT"); logging(LOG_VERBOSE, "Test WRITE16 with non-zero WRPROTECT");
buf = malloc(block_size);
for (i = 1; i < 8; i++) { for (i = 1; i < 8; i++) {
ret = write16_invalidfieldincdb(iscsic, tgt_lun, 0, ret = write16_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, block_size, block_size, block_size,
i, 0, 0, 0, 0, NULL); i, 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
} }
free(buf);
} }