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

TESTS: make the "is readcapacity16 supported on this device" tests cleaner

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-04-22 17:11:38 -07:00
parent af6d1c9c13
commit 77ff1b1808
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test-tool/test_readcapacity16_alloclen.c
View File

@@ -36,9 +36,14 @@ test_readcapacity16_alloclen(void)
for (i = 0; i < 16; i++) {
ret = readcapacity16(iscsic, tgt_lun, i);
if (sbc3_support && ret == -2) {
logging(LOG_NORMAL, "[FAILED] READCAPACITY16 is not available but the device claims SBC-3 support.");
CU_FAIL("READCAPACITY16 failed but the device claims SBC-3 support.");
if (ret == -2) {
if (sbc3_support) {
logging(LOG_NORMAL, "[FAILED] READCAPACITY16 is not available but the device claims SBC-3 support.");
CU_FAIL("READCAPACITY16 failed but the device claims SBC-3 support.");
} else {
logging(LOG_NORMAL, "[SKIPPED] READCAPACITY16 is not implemented on this target and it does not claim SBC-3 support.");
CU_PASS("READCAPACITY16 is not implemented and no SBC-3 support claimed.");
}
return;
}
CU_ASSERT_EQUAL(ret, 0);

16
test-tool/test_readcapacity16_simple.c
View File

@@ -36,14 +36,14 @@ test_readcapacity16_simple(void)
logging(LOG_VERBOSE, "Test that READCAPACITY16 works");
ret = readcapacity16(iscsic, tgt_lun, 16);
if (sbc3_support && ret == -2) {
logging(LOG_NORMAL, "[FAILED] READCAPACITY16 is not available but the device claims SBC-3 support.");
CU_FAIL("READCAPACITY16 failed but the device claims SBC-3 support.");
return;
}
if (!sbc3_support && ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] READCAPACITY16 is not implemented on this target and it does not claim SBC-3 support.");
CU_PASS("READCAPACITY16 is not implemented and no SBC-3 support claimed.");
if (ret == -2) {
if (sbc3_support) {
logging(LOG_NORMAL, "[FAILED] READCAPACITY16 is not available but the device claims SBC-3 support.");
CU_FAIL("READCAPACITY16 failed but the device claims SBC-3 support.");
} else {
logging(LOG_NORMAL, "[SKIPPED] READCAPACITY16 is not implemented on this target and it does not claim SBC-3 support.");
CU_PASS("READCAPACITY16 is not implemented and no SBC-3 support claimed.");
}
return;
}
CU_ASSERT_EQUAL(ret, 0);