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

test-tool/test_async_lu_reset_simple: Continue upon reconnect error

Browse Source 
Instead of stopping all tests if a reconnect fails, only stop
test_async_lu_reset_simple.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
This commit is contained in:
Bart Van Assche
2017-10-30 16:57:55 -07:00
parent ba8cac6b05
commit fee9eb9423
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test-tool/test_async_lu_reset_simple.c
View File

@@ -33,6 +33,8 @@ struct tests_async_reset_state {
uint32_t reset_ok; uint32_t reset_ok;
}; };
static int reconnect_succeeded;
static void static void
test_async_write_cb(struct iscsi_context *iscsi __attribute__((unused)), test_async_write_cb(struct iscsi_context *iscsi __attribute__((unused)),
int status, void *command_data, int status, void *command_data,
@@ -63,7 +65,9 @@ test_async_reset_cb(struct iscsi_context *iscsi __attribute__((unused)),
struct tests_async_reset_state *state = private_data; struct tests_async_reset_state *state = private_data;
/* command_data NULL if a reconnect occured. see iscsi_reconnect_cb() */ /* command_data NULL if a reconnect occured. see iscsi_reconnect_cb() */
CU_ASSERT_PTR_NOT_NULL_FATAL(command_data); reconnect_succeeded = command_data != NULL;
if (!reconnect_succeeded)
return;
tmf_response = *(uint32_t *)command_data; tmf_response = *(uint32_t *)command_data;
logging(LOG_VERBOSE, "LU RESET: TMF response %d for" logging(LOG_VERBOSE, "LU RESET: TMF response %d for"
@@ -150,6 +154,9 @@ test_async_lu_reset_simple(void)
0xffffffff, 0, 0xffffffff, 0,
test_async_reset_cb, &state); test_async_reset_cb, &state);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
CU_ASSERT_EQUAL(reconnect_succeeded, 1);
if (!reconnect_succeeded)
goto out;
logging(LOG_VERBOSE, "LU RESET queued"); logging(LOG_VERBOSE, "LU RESET queued");
@@ -191,6 +198,7 @@ test_async_lu_reset_simple(void)
CU_FAIL("unexpected WRITE/RESET state"); CU_FAIL("unexpected WRITE/RESET state");
} }
out:
scsi_free_scsi_task(state.wtask); scsi_free_scsi_task(state.wtask);
/* Avoid that callbacks get invoked after this test finished */ /* Avoid that callbacks get invoked after this test finished */