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

34
test-tool/1030_unsolicited_data_overflow.c
View File

@@ -23,8 +23,6 @@
#include "scsi-lowlevel.h"
#include "iscsi-test.h"
uint32_t block_size;
static void test_cb(struct iscsi_context *iscsi _U_, int status,
void *command_data _U_, void *private_data)
{
@@ -39,12 +37,11 @@ static void test_cb(struct iscsi_context *iscsi _U_, int status,
}
}
int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int data_loss, int show_info)
int T1030_unsolicited_data_overflow(const char *initiator, const char *url)
{
struct iscsi_context *iscsi = NULL;
struct iscsi_context *iscsi2 = NULL;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, lun;
unsigned char *buf = NULL;
struct iscsi_async_state test_state;
@@ -65,30 +62,6 @@ int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int
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;
scsi_free_scsi_task(task);
if (!data_loss) {
printf("--dataloss flag is not set. Skipping test\n");
ret = -2;
@@ -118,8 +91,8 @@ int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITE16 command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test2;
ret = -1;
goto finished;
}
test_state.task = task;
@@ -129,7 +102,6 @@ int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int
printf("[OK]\n");
test2:
printf("Verify the target is still alive ... ");
iscsi2 = iscsi_context_login(initiator, url, &lun);
if (iscsi2 == NULL) {