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

Tests: add helper for TESTUNITREADY

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2016-02-21 12:10:34 -08:00
parent 05fb882e19
commit ea8e4c4115
15 changed files with 80 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test-tool/iscsi-support.h
View File

@@ -434,6 +434,20 @@ do { \
CU_ASSERT_EQUAL(_r, 0); \
} while (0);
#define TESTUNITREADY(...) \
do { \
int _r; \
_r = testunitready(__VA_ARGS__); \
if (_r == -2) { \
logging(LOG_NORMAL, "[SKIPPED] TESTUNITREADY " \
"is not implemented."); \
CU_PASS("[SKIPPED] Target does not support " \
"TESTUNITREADY. Skipping test"); \
return; \
} \
CU_ASSERT_EQUAL(_r, 0); \
} while (0);
#define VERIFY10(...) \
do { \
int _r; \

6
test-tool/test_iscsi_cmdsn_toohigh.c
View File

@@ -85,8 +85,6 @@ void test_iscsi_cmdsn_toohigh(void)
iscsi_set_noautoreconnect(sd->iscsi_ctx, 0);
logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
}

6
test-tool/test_iscsi_cmdsn_toolow.c
View File

@@ -86,8 +86,6 @@ void test_iscsi_cmdsn_toolow(void)
iscsi_set_noautoreconnect(sd->iscsi_ctx, 0);
logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
}

5
test-tool/test_preventallow_2_itnexuses.c
View File

@@ -54,9 +54,8 @@ test_preventallow_2_itnexuses(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Create a second connection to the target");
ret = mpath_sd2_get_or_clone(sd, &sd2);

17
test-tool/test_preventallow_cold_reset.c
View File

@@ -28,7 +28,7 @@
void
test_preventallow_cold_reset(void)
{
int ret;
int ret;
CHECK_FOR_SBC;
CHECK_FOR_REMOVABLE;
@@ -52,27 +52,24 @@ test_preventallow_cold_reset(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Perform cold reset on target");
ret = iscsi_task_mgmt_target_cold_reset_sync(sd->iscsi_ctx);
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Wait until all unit attentions clear");
while (testunitready(sd, EXPECT_STATUS_GOOD) != 0)
;
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Try to eject the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Load the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,

13
test-tool/test_preventallow_eject.c
View File

@@ -28,8 +28,6 @@
void
test_preventallow_eject(void)
{
int ret;
CHECK_FOR_SBC;
CHECK_FOR_REMOVABLE;
@@ -44,9 +42,8 @@ test_preventallow_eject(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test we can clear PREVENT flag");
PREVENTALLOW(sd, 0);
@@ -54,12 +51,10 @@ test_preventallow_eject(void)
logging(LOG_VERBOSE, "Try to eject the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Set the PREVENT flag");
PREVENTALLOW(sd, 1);

13
test-tool/test_preventallow_itnexus_loss.c
View File

@@ -28,8 +28,6 @@
void
test_preventallow_itnexus_loss(void)
{
int ret;
CHECK_FOR_SBC;
CHECK_FOR_REMOVABLE;
@@ -52,10 +50,8 @@ test_preventallow_itnexus_loss(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Disconnect from the target.");
iscsi_destroy_context(sd->iscsi_ctx);
@@ -72,9 +68,8 @@ test_preventallow_itnexus_loss(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Load the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,

12
test-tool/test_preventallow_logout.c
View File

@@ -28,8 +28,6 @@
void
test_preventallow_logout(void)
{
int ret;
CHECK_FOR_SBC;
CHECK_FOR_REMOVABLE;
@@ -52,9 +50,8 @@ test_preventallow_logout(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Logout from target");
iscsi_logout_sync(sd->iscsi_ctx);
@@ -72,9 +69,8 @@ test_preventallow_logout(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Load the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,

11
test-tool/test_preventallow_lun_reset.c
View File

@@ -52,10 +52,8 @@ test_preventallow_lun_reset(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Perform LUN reset on target");
ret = iscsi_task_mgmt_lun_reset_sync(sd->iscsi_ctx, sd->iscsi_lun);
@@ -70,9 +68,8 @@ test_preventallow_lun_reset(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Load the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,

11
test-tool/test_preventallow_warm_reset.c
View File

@@ -52,10 +52,8 @@ test_preventallow_warm_reset(void)
EXPECT_REMOVAL_PREVENTED);
logging(LOG_VERBOSE, "Verify we can still access the media.");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Perform warm reset on target");
ret = iscsi_task_mgmt_target_warm_reset_sync(sd->iscsi_ctx);
@@ -70,9 +68,8 @@ test_preventallow_warm_reset(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can not access the media.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Load the medium");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,

10
test-tool/test_sanitize_reset.c
View File

@@ -95,9 +95,8 @@ test_sanitize_reset(void)
logging(LOG_VERBOSE, "Verify that the SANITIZE has started and that "
"TESTUNITREADY fails with SANITIZE_IN_PROGRESS");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Verify that STARTSTOPUNIT fails with "
"SANITIZE_IN_PROGRESS");
@@ -164,9 +163,8 @@ test_sanitize_reset(void)
}
logging(LOG_VERBOSE, "Verify that the SANITIZE is still going.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Wait until the SANITIZE operation has finished");
while (testunitready_clear_ua(sd)) {

43
test-tool/test_startstopunit_noloej.c
View File

@@ -29,8 +29,6 @@
void
test_startstopunit_noloej(void)
{
int ret;
logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test STARTSTOPUNIT LOEJ==0");
if (!inq->rmb) {
@@ -44,73 +42,64 @@ test_startstopunit_noloej(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==0 START==1");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 0, 1,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==0");
STARTSTOPUNIT(sd, 1, 0, 0, 0, 0, 0,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==1");
STARTSTOPUNIT(sd, 1, 0, 0, 0, 0, 1,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==0");
STARTSTOPUNIT(sd, 0, 0, 0, 1, 0, 0,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==1");
STARTSTOPUNIT(sd, 0, 0, 0, 1, 0, 1,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==0");
STARTSTOPUNIT(sd, 1, 0, 0, 1, 0, 0,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==1");
STARTSTOPUNIT(sd, 1, 0, 0, 1, 0, 1,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "In case the target did eject the medium, load it again.");
STARTSTOPUNIT(sd, 1, 0, 0, 0, 1, 1,

7
test-tool/test_startstopunit_pwrcnd.c
View File

@@ -29,7 +29,7 @@
void
test_startstopunit_pwrcnd(void)
{
int i, ret;
int i;
logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test STARTSTOPUNIT PowerCondition");
@@ -45,9 +45,8 @@ test_startstopunit_pwrcnd(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
}
logging(LOG_VERBOSE, "In case the target did eject the medium, load it again.");

22
test-tool/test_startstopunit_simple.c
View File

@@ -52,29 +52,24 @@ test_startstopunit_simple(void)
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is ejected.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Test we can load the removable the media with IMMED==1");
STARTSTOPUNIT(sd, 1, 0, 0, 0, 1, 1,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can read from the media.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
logging(LOG_VERBOSE, "Test we can eject removable the media with IMMED==1");
STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is ejected.");
ret = testunitready(sd,
EXPECT_NO_MEDIUM);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_NO_MEDIUM);
logging(LOG_VERBOSE, "Test we can load the removable the media with IMMED==1");
@@ -82,7 +77,6 @@ test_startstopunit_simple(void)
EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Verify we can access the media again.");
ret = testunitready(sd,
EXPECT_SANITIZE);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_SANITIZE);
}

7
test-tool/test_testunitready_simple.c
View File

@@ -27,11 +27,8 @@
void
test_testunitready_simple(void)
{
int ret;
logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test TESTUNITREADY");
ret = testunitready(sd,
EXPECT_STATUS_GOOD);
CU_ASSERT_EQUAL(ret, 0);
TESTUNITREADY(sd,
EXPECT_STATUS_GOOD);
}