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

TESTS: clear unit attention after changing SWP settings in the readonly test

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-07-21 09:20:00 -07:00
parent 52a83e91af
commit b1b3c603af
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1440,7 +1440,7 @@ int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int
{ {
struct scsi_task *task; struct scsi_task *task;
logging(LOG_VERBOSE, "Send SANITIZE (Expecting RESERVATION_CONFLICT) " logging(LOG_VERBOSE, "Send SANITIZE (Expecting WRITE_PROTECTED) "
"IMMED:%d AUSE:%d SA:%d " "IMMED:%d AUSE:%d SA:%d "
"PARAM_LEN:%d", "PARAM_LEN:%d",
immed, ause, sa, param_len); immed, ause, sa, param_len);
@@ -1588,8 +1588,11 @@ testunitready_clear_ua(struct iscsi_context *iscsi, int lun)
logging(LOG_NORMAL, logging(LOG_NORMAL,
"[INFO] TESTUNITREADY command: failed with sense. %s", "[INFO] TESTUNITREADY command: failed with sense. %s",
iscsi_get_error(iscsi)); iscsi_get_error(iscsi));
return -1;
} }
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
logging(LOG_VERBOSE, "[OK] TESTUNITREADY does not return unit "
"attention.");
return 0; return 0;
} }

8
test-tool/test_sanitize_readonly.c
View File

@@ -53,6 +53,10 @@ test_sanitize_readonly(void)
return; return;
} }
logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on "
"first connection");
while (testunitready_clear_ua(iscsic, tgt_lun));
logging(LOG_VERBOSE, "Check if SANITIZE OVERWRITE is supported " logging(LOG_VERBOSE, "Check if SANITIZE OVERWRITE is supported "
"in REPORT_SUPPORTED_OPCODES"); "in REPORT_SUPPORTED_OPCODES");
cd = get_command_descriptor(SCSI_OPCODE_SANITIZE, cd = get_command_descriptor(SCSI_OPCODE_SANITIZE,
@@ -109,6 +113,10 @@ test_sanitize_readonly(void)
logging(LOG_VERBOSE, "Clear Software Write Protect on the second connection"); logging(LOG_VERBOSE, "Clear Software Write Protect on the second connection");
ret = clear_swp(iscsic2, tgt_lun); ret = clear_swp(iscsic2, tgt_lun);
logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on "
"first connection");
while (testunitready_clear_ua(iscsic, tgt_lun));
iscsi_destroy_context(iscsic2); iscsi_destroy_context(iscsic2);
iscsic2 = NULL; iscsic2 = NULL;
} }