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

TESTS: Fix COMPAREANDWRITE tests to send write data

Browse Source 
Previously COMPAREANDWRITE was only sending verify instance data which
can cause targets to generate COMMAND ABORTED/NOT ENOUGH UNSOLICITED
DATA errors due to the buffer being obviously too small to contain
verify AND write instance data.

The buffer size check has been modified and compareandwrite tests
updated to pass a larger buffer with interesting write instance data.
This commit is contained in:
Sitsofe Wheeler
2013-09-09 16:42:15 +01:00
parent 45a3752d16
commit 0b6b12ba53
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/0340_compareandwrite_simple.c
+14 -2
View File
@@ -21,6 +21,14 @@
#include "scsi-lowlevel.h"
#include "iscsi-test.h"
static void bitwise_invert(unsigned char data[], int len) {
int j;
for (j = 0; j < len; j++) {
data[j] = ~data[j];
}
}
int T0340_compareandwrite_simple(const char *initiator, const char *url)
{
struct iscsi_context *iscsi;
@@ -80,9 +88,11 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url)
goto finished;
}
memcpy(data, task->datain.data, i * block_size);
memcpy(data + (i * block_size), task->datain.data, i * block_size);
bitwise_invert(data + (i * block_size), i * block_size);
scsi_free_scsi_task(task);
task = iscsi_compareandwrite_sync(iscsi, lun, 0, data, i * block_size, block_size, 0, 0, 0, 0, 0);
task = iscsi_compareandwrite_sync(iscsi, lun, 0, data, i * 2 * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
@@ -136,9 +146,11 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url)
goto finished;
}
memcpy(data, task->datain.data, i * block_size);
memcpy(data + (i * block_size), task->datain.data, i * block_size);
bitwise_invert(data + (i * block_size), i * block_size);
scsi_free_scsi_task(task);
task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks + 1 - i, data, i * block_size, block_size, 0, 0, 0, 0, 0);
task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks + 1 - i, data, i * 2 * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));