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

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
+12 -44
View File
@@ -20,14 +20,11 @@
#include "scsi-lowlevel.h"
#include "iscsi-test.h"
int T0194_writesame16_0blocks(const char *initiator, const char *url, int data_loss _U_, int show_info)
int T0194_writesame16_0blocks(const char *initiator, const char *url)
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, lun;
uint32_t block_size;
uint64_t num_blocks;
unsigned char buf[4096];
printf("0194_writesame16_0blocks:\n");
@@ -48,30 +45,6 @@ int T0194_writesame16_0blocks(const char *initiator, const char *url, int data_l
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;
@@ -88,7 +61,7 @@ int T0194_writesame16_0blocks(const char *initiator, const char *url, int data_l
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto test2;
goto finished;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
@@ -104,13 +77,12 @@ int T0194_writesame16_0blocks(const char *initiator, const char *url, int data_l
printf("WRITESAME16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto test2;
goto finished;
}
scsi_free_scsi_task(task);
printf("[OK]\n");
test2:
printf("Writesame16 0blocks at one block beyond <end-of-LUN> ... ");
task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
num_blocks + 1, 0, 0, 0, 0, 0, 0, 0);
@@ -118,14 +90,14 @@ test2:
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto test3;
goto finished;
}
if (task->status == SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("WRITESAME16 command: Should fail when writing 0blocks beyond end\n");
ret = -1;
scsi_free_scsi_task(task);
goto test3;
goto finished;
}
if (task->status != SCSI_STATUS_CHECK_CONDITION
|| task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST
@@ -134,13 +106,12 @@ test2:
printf("WRITESAME16 failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE. Sense:%s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto test3;
goto finished;
}
scsi_free_scsi_task(task);
printf("[OK]\n");
test3:
printf("Writesame16 0blocks at LBA 2^63 ... ");
task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
0x8000000000000000, 0, 0, 0, 0, 0, 0, 0);
@@ -148,14 +119,14 @@ test3:
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto test4;
goto finished;
}
if (task->status == SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("WRITESAME16 command: Should fail when writing 0blocks at 2^63\n");
ret = -1;
scsi_free_scsi_task(task);
goto test4;
goto finished;
}
if (task->status != SCSI_STATUS_CHECK_CONDITION
|| task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST
@@ -164,13 +135,12 @@ test3:
printf("WRITESAME16 failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE. Sense:%s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto test4;
goto finished;
}
scsi_free_scsi_task(task);
printf("[OK]\n");
test4:
printf("Writesame16 0blocks at LBA -1 ... ");
task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
-1, 0, 0, 0, 0, 0, 0, 0);
@@ -178,14 +148,14 @@ test4:
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto test5;
goto finished;
}
if (task->status == SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("WRITESAME16 command: Should fail when writing 0blocks at -1\n");
ret = -1;
scsi_free_scsi_task(task);
goto test5;
goto finished;
}
if (task->status != SCSI_STATUS_CHECK_CONDITION
|| task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST
@@ -194,14 +164,12 @@ test4:
printf("WRITESAME16 failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE. Sense:%s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto test5;
goto finished;
}
scsi_free_scsi_task(task);
printf("[OK]\n");
test5:
finished:
iscsi_logout_sync(iscsi);
iscsi_destroy_context(iscsi);