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

TESTS: Start fixing up the tests so we can test-suite them properly

Browse Source 
Dont call READCAPACITY from every single test.
Remove two arguments from the test signatures and turn them into globals.
remove the ret++ silliness.  Tests return 0 : all ok, -2, skipped or -1 : test failed
This commit is contained in:
Ronnie Sahlberg
2012-12-26 18:34:12 -08:00
parent 3c960c1d42
commit 5ad957b873
126 changed files with 1096 additions and 3554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
test-tool/0340_compareandwrite_simple.c
View File

@@ -21,14 +21,11 @@
#include "scsi-lowlevel.h"
#include "iscsi-test.h"
int T0340_compareandwrite_simple(const char *initiator, const char *url, int data_loss, int show_info)
int T0340_compareandwrite_simple(const char *initiator, const char *url)
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size;
uint64_t num_blocks;
unsigned char data[4096 * 256];
printf("0340_compareandwrite_simple:\n");
@@ -47,31 +44,6 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url, int dat
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
if (!data_loss) {
printf("--dataloss flag is not set. Skipping test\n");
ret = -2;
@@ -89,23 +61,23 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url, int dat
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test2;
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test2;
goto finished;
}
if (task->datain.data == NULL) {
printf("[FAILED]\n");
printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test2;
goto finished;
}
memcpy(data, task->datain.data, i * block_size);
scsi_free_scsi_task(task);
@@ -114,8 +86,8 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url, int dat
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test2;
ret = -1;
goto finished;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
@@ -129,16 +101,15 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url, int dat
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("COMPAREANDWRITE command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test2;
goto finished;
}
scsi_free_scsi_task(task);
}
printf("[OK]\n");
test2:
/* write the last 1 - 255 blocks at the end of the LUN */
printf("Compare and write last 1-255 blocks ... ");
for (i = 1; i < 256; i++) {
@@ -146,23 +117,23 @@ test2:
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test3;
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test3;
goto finished;
}
if (task->datain.data == NULL) {
printf("[FAILED]\n");
printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test3;
goto finished;
}
memcpy(data, task->datain.data, i * block_size);
scsi_free_scsi_task(task);
@@ -171,21 +142,20 @@ test2:
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test3;
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("COMPAREANDWRITE command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret++;
ret = -1;
scsi_free_scsi_task(task);
goto test3;
goto finished;
}
scsi_free_scsi_task(task);
}
printf("[OK]\n");
test3:
finished:
iscsi_logout_sync(iscsi);