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

TEST: Fix the READ6 tests so they work for linux usb devices

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2015-09-19 14:55:58 -07:00
parent e57b266e91
commit ac3b1d6e3c
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/test_read6_simple.c
+29 -20
View File
@@ -34,6 +34,10 @@ test_read6_simple(void)
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test READ6 of 1-255 blocks at the start of the LUN"); logging(LOG_VERBOSE, "Test READ6 of 1-255 blocks at the start of the LUN");
for (i = 1; i <= 255; i++) { for (i = 1; i <= 255; i++) {
if (maximum_transfer_length && maximum_transfer_length < i) {
break;
}
ret = read6(sd, NULL, 0, i * block_size, ret = read6(sd, NULL, 0, i * block_size,
block_size, NULL, block_size, NULL,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
@@ -51,6 +55,10 @@ test_read6_simple(void)
CU_PASS("LUN is too big for read-at-eol tests with READ6. Skipping test.\n"); CU_PASS("LUN is too big for read-at-eol tests with READ6. Skipping test.\n");
} else { } else {
for (i = 1; i <= 255; i++) { for (i = 1; i <= 255; i++) {
if (maximum_transfer_length && maximum_transfer_length < i) {
break;
}
ret = read6(sd, NULL, num_blocks - i, ret = read6(sd, NULL, num_blocks - i,
i * block_size, block_size, NULL, i * block_size, block_size, NULL,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
@@ -58,28 +66,29 @@ test_read6_simple(void)
} }
} }
logging(LOG_VERBOSE, "Transfer length == 0 means we want to transfer "
"256 blocks");
logging(LOG_VERBOSE, "Test sending a READ6 with transfer length == 0 "
"(meaning 256 blocks)");
/* 256 is converted to 0 when the CDB is marshalled by the helper */ /* 256 is converted to 0 when the CDB is marshalled by the helper */
ret = read6(sd, &task, 0, if (maximum_transfer_length >= 256) {
256 * block_size, block_size, NULL, logging(LOG_VERBOSE, "Transfer length == 0 means we want to "
EXPECT_STATUS_GOOD); "transfer 256 blocks");
if (task->status != SCSI_STATUS_GOOD) { ret = read6(sd, &task, 0,
logging(LOG_NORMAL, "[FAILED] READ6 command: " 256 * block_size, block_size, NULL,
"failed with sense. %s", sd->error_str ); EXPECT_STATUS_GOOD);
} if (task->status != SCSI_STATUS_GOOD) {
CU_ASSERT_EQUAL(task->status, SCSI_STATUS_GOOD); logging(LOG_NORMAL, "[FAILED] READ6 command: "
"failed with sense. %s", sd->error_str );
}
CU_ASSERT_EQUAL(task->status, SCSI_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify that we did get 256 blocks of data back"); logging(LOG_VERBOSE, "Verify that we did get 256 blocks of "
if (task->datain.size == (int)(256 * block_size)) { "data back");
logging(LOG_VERBOSE, "[SUCCESS] Target returned 256 blocks of " if (task->datain.size == (int)(256 * block_size)) {
"data"); logging(LOG_VERBOSE, "[SUCCESS] Target returned 256 "
} else { "blocks of data");
logging(LOG_NORMAL, "[FAILED] Target did not return 256 " } else {
"blocks of data"); logging(LOG_NORMAL, "[FAILED] Target did not return "
"256 blocks of data");
}
CU_ASSERT_EQUAL(task->datain.size, (int)(256 * block_size));
} }
CU_ASSERT_EQUAL(task->datain.size, (int)(256 * block_size));
} }