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

Fix merge conflicts

Browse Source
This commit is contained in:
Jon Grimm
2012-10-01 09:48:03 -05:00
parent 2a2f246615 30a32b4335
commit a5cc1fdbe8
10 changed files with 560 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test-tool/0420_reserve6_simple.c
View File

@@ -51,7 +51,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
return -1;
}
iscsi2 = iscsi_context_login(initiator, url, &lun);
iscsi2 = iscsi_context_login(initiator2, url, &lun);
if (iscsi2 == NULL) {
printf("Failed to login to target\n");
ret = 1;
@@ -60,7 +60,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
ret = 0;
printf("Send RESERVE6...\n");
printf("Send RESERVE6 ... ");
task = iscsi_reserve6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -89,7 +89,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
scsi_free_scsi_task(task);
printf("[OK]\n");
printf("Send RELEASE6...\n");
printf("Send RELEASE6 ... ");
task = iscsi_release6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -108,9 +108,10 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
scsi_free_scsi_task(task);
printf("[OK]\n");
test2:
printf("Test that reservation works.\n");
printf("Send RESERVE6 from Initiator 1...\n");
printf("Send RESERVE6 from Initiator 1. ... ");
task = iscsi_reserve6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -129,7 +130,6 @@ test2:
scsi_free_scsi_task(task);
printf("[OK]\n");
printf("Send another RESERVE6 from Initiator 1...\n");
task = iscsi_reserve6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -149,7 +149,7 @@ test2:
printf("[OK]\n");
test3:
printf("Send RESERVE6 from Initiator 2...Expect conflict.\n");
printf("Send RESERVE6 from Initiator 2. Expect conflict. ... ");
task = iscsi_reserve6_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -169,7 +169,7 @@ test3:
printf("[OK]\n");
test3a:
printf("Send RELEASE6 from Initiator 2..Expect NO-OP.\n");
printf("Send RELEASE6 from Initiator 2..Expect NO-OP. ... ");
task = iscsi_release6_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -192,7 +192,7 @@ test3a:
printf("[OK]\n");
test4:
printf("Send TESTUNITREADY from Initiator 1...\n");
printf("Send TESTUNITREADY from Initiator 1 ... ");
task = iscsi_testunitready_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -212,7 +212,7 @@ test4:
printf("[OK]\n");
test5:
printf("Send TESTUNITREADY from Initiator 2...Expect conflict.\n");
printf("Send TESTUNITREADY from Initiator 2. Expect conflict. ... ");
task = iscsi_testunitready_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -232,7 +232,7 @@ test5:
test6:
printf("Test that release actually works\n");
printf("Send RELEASE6 from Initiator 1...\n");
printf("Send RELEASE6 from Initiator 1 ... ");
task = iscsi_release6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -251,7 +251,7 @@ test6:
scsi_free_scsi_task(task);
printf("[OK]\n");
printf("Send RESERVE6 Initiator 2...\n");
printf("Send RESERVE6 Initiator 2 ... ");
task = iscsi_reserve6_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");
@@ -270,7 +270,7 @@ test6:
scsi_free_scsi_task(task);
printf("[OK]\n");
printf("Send RELEASE6 Initiator 2...\n");
printf("Send RELEASE6 Initiator 2 ... ");
task = iscsi_reserve6_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");