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

TESTS: improve text output for test_report_supported_opcodes_rctd

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2015-05-13 19:54:50 -07:00
parent 6e4a84f815
commit 2f10f05084
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test-tool/test_report_supported_opcodes_rctd.c
View File

@@ -37,7 +37,7 @@ test_report_supported_opcodes_rctd(void)
logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes " logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes "
"without timeout descriptors"); "without timeout descriptors. RCTD==0");
ret = report_supported_opcodes( ret = report_supported_opcodes(
sd, &rso_task, sd, &rso_task,
0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0,
@@ -66,7 +66,7 @@ test_report_supported_opcodes_rctd(void)
for (i = 0; i < rsoc->num_descriptors; i++) { for (i = 0; i < rsoc->num_descriptors; i++) {
if (rsoc->descriptors[i].ctdp) { if (rsoc->descriptors[i].ctdp) {
logging(LOG_NORMAL, "[FAILED] Command descriptor with " logging(LOG_NORMAL, "[FAILED] Command descriptor with "
"CTDP set"); "CTDP set received when RCTD==0");
CU_FAIL("[FAILED] Command descriptor with " CU_FAIL("[FAILED] Command descriptor with "
"CTDP set"); "CTDP set");
} }
@@ -76,7 +76,7 @@ test_report_supported_opcodes_rctd(void)
logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes " logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes "
"with timeout descriptors"); "with timeout descriptors. RCTD==1");
ret = report_supported_opcodes( ret = report_supported_opcodes(
sd, &rso_task, sd, &rso_task,
1, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 1, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0,
@@ -96,7 +96,7 @@ test_report_supported_opcodes_rctd(void)
for (i = 0; i < rsoc->num_descriptors; i++) { for (i = 0; i < rsoc->num_descriptors; i++) {
if (!rsoc->descriptors[i].ctdp) { if (!rsoc->descriptors[i].ctdp) {
logging(LOG_NORMAL, "[FAILED] Command descriptor " logging(LOG_NORMAL, "[FAILED] Command descriptor "
"without CTDP set"); "with CTDP clear when RCTD==1");
CU_FAIL("[FAILED] Command descriptor without " CU_FAIL("[FAILED] Command descriptor without "
"CTDP set"); "CTDP set");
} }
@@ -105,7 +105,8 @@ test_report_supported_opcodes_rctd(void)
logging(LOG_VERBOSE, "Verify that all timeout descriptors have the " logging(LOG_VERBOSE, "Verify that all timeout descriptors have the "
"correct length"); "correct length");
for (i = 0; i < rsoc->num_descriptors; i++) { for (i = 0; i < rsoc->num_descriptors; i++) {
if (rsoc->descriptors[i].to.descriptor_length != 0x0a) { if (rsoc->descriptors[i].ctdp &&
rsoc->descriptors[i].to.descriptor_length != 0x0a) {
logging(LOG_NORMAL, "[FAILED] Command descriptor " logging(LOG_NORMAL, "[FAILED] Command descriptor "
"with invalid TimeoutDescriptor length"); "with invalid TimeoutDescriptor length");
CU_FAIL("[FAILED] Command descriptor with " CU_FAIL("[FAILED] Command descriptor with "