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:
@@ -23,7 +23,6 @@
|
||||
#include "iscsi-test.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
uint32_t block_size;
|
||||
int pdu_was_valid;
|
||||
|
||||
/* one block sent as immediate data. PDU should have F-bit set
|
||||
@@ -46,11 +45,10 @@ static int my_queue_immediate_data(struct iscsi_context *iscsi _U_, struct iscsi
|
||||
return 1;
|
||||
}
|
||||
|
||||
int T1041_unsolicited_immediate_data(const char *initiator, const char *url, int data_loss, int show_info)
|
||||
int T1041_unsolicited_immediate_data(const char *initiator, const char *url)
|
||||
{
|
||||
struct iscsi_context *iscsi;
|
||||
struct scsi_task *task;
|
||||
struct scsi_readcapacity16 *rc16;
|
||||
int ret, lun;
|
||||
struct iscsi_url *iscsi_url;
|
||||
unsigned char data[4096];
|
||||
@@ -79,30 +77,6 @@ int T1041_unsolicited_immediate_data(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");
|
||||
|
||||
Reference in New Issue
Block a user