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

TESTS: ORWRITE is optional, lack os support should skip the test not fail it

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-04-26 17:52:55 -07:00
parent 78e02737c6
commit 1331656f85
7 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test-tool/iscsi-support.c
View File

@@ -213,6 +213,13 @@ orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
return -2;
}
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] ORWRITE command: "
"failed with sense. %s", iscsi_get_error(iscsi));
@@ -251,6 +258,13 @@ orwrite_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should "
"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -299,6 +313,13 @@ orwrite_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should "
"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -346,6 +367,13 @@ orwrite_writeprotected(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should "
"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -397,8 +425,8 @@ orwrite_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba,
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented on target");
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {

5
test-tool/test_orwrite_0blocks.c
View File

@@ -37,9 +37,10 @@ test_orwrite_0blocks(void)
0, block_size,
0, 0, 0, 0, 0, NULL);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support ORWRITE. Skipping test");
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
CU_PASS("ORWRITE is not implemented.");
return;
}
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test ORWRITE 0-blocks one block past end-of-LUN");

5
test-tool/test_orwrite_beyond_eol.c
View File

@@ -43,9 +43,10 @@ test_orwrite_beyond_eol(void)
0, 0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support ORWRITE. Skipping test");
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
CU_PASS("ORWRITE is not implemented.");
return;
}
}
CU_ASSERT_EQUAL(ret, 0);
}

10
test-tool/test_orwrite_simple.c
View File

@@ -41,12 +41,12 @@ test_orwrite_simple(void)
ret = orwrite(iscsic, tgt_lun, 0, i * block_size,
block_size, 0, 0, 0, 0, 0, buf);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support ORWRITE. Skipping test");
free(buf);
return;
}
free(buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
CU_PASS("ORWRITE is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}

12
test-tool/test_orwrite_verify.c
View File

@@ -44,6 +44,11 @@ test_orwrite_verify(void)
memset(buf, 0, block_size * i);
ret = write16(iscsic, tgt_lun, 0, i * block_size,
block_size, 0, 0, 0, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE16 is not implemented.");
CU_PASS("WRITE16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i);
@@ -51,11 +56,10 @@ test_orwrite_verify(void)
ret = orwrite(iscsic, tgt_lun, 0, i * block_size,
block_size, 0, 0, 0, 0, 0, buf);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support ORWRITE. Skipping test");
free(buf);
free(readbuf);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
CU_PASS("ORWRITE is not implemented.");
return;
}
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Read %d blocks back", i);

5
test-tool/test_orwrite_wrprotect.c
View File

@@ -46,10 +46,11 @@ test_orwrite_wrprotect(void)
block_size, block_size,
i, 0, 0, 0, 0, buf);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support ORWRITE. Skipping test");
free(buf);
logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented.");
CU_PASS("ORWRITE is not implemented.");
return;
}
}
CU_ASSERT_EQUAL(ret, 0);
}
free(buf);

1
test-tool/test_readonly_sbc.c
View File

@@ -63,7 +63,6 @@ test_readonly_sbc(void)
}
CU_ASSERT_NOT_EQUAL(ret, -1);
logging(LOG_VERBOSE, "Test WRITE_SAME16 fails with WRITE_PROTECTED");
ret = writesame16_writeprotected(iscsic, tgt_lun, 0, block_size, 1,
0, 0, 0, 0, buf);