From f6570e6f1276e2dd87d487079c2e8117bc29bfff Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 2 Oct 2016 15:35:46 -0700 Subject: [PATCH] TESTS: Abort the cold/warm reset tests if the target support is missing. Not all targets support cold/warm reset task management functions. Abort these tests if the support is missing and the commands fail. Signed-off-by: Ronnie Sahlberg --- test-tool/test_preventallow_cold_reset.c | 8 +++++++- test-tool/test_preventallow_warm_reset.c | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/test-tool/test_preventallow_cold_reset.c b/test-tool/test_preventallow_cold_reset.c index 9932ac7..02352b9 100644 --- a/test-tool/test_preventallow_cold_reset.c +++ b/test-tool/test_preventallow_cold_reset.c @@ -57,7 +57,13 @@ test_preventallow_cold_reset(void) logging(LOG_VERBOSE, "Perform cold reset on target"); ret = iscsi_task_mgmt_target_cold_reset_sync(sd->iscsi_ctx); - CU_ASSERT_EQUAL(ret, 0); + if (ret != 0) { + const char *err = "[SKIPPED] Task Management function" + "for ColdReset is not working/implemented\n"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } logging(LOG_VERBOSE, "Wait until all unit attentions clear"); while (testunitready(sd, EXPECT_STATUS_GOOD) != 0) diff --git a/test-tool/test_preventallow_warm_reset.c b/test-tool/test_preventallow_warm_reset.c index c3e713d..3c95df5 100644 --- a/test-tool/test_preventallow_warm_reset.c +++ b/test-tool/test_preventallow_warm_reset.c @@ -57,7 +57,14 @@ test_preventallow_warm_reset(void) logging(LOG_VERBOSE, "Perform warm reset on target"); ret = iscsi_task_mgmt_target_warm_reset_sync(sd->iscsi_ctx); - CU_ASSERT_EQUAL(ret, 0); + if (ret != 0) { + const char *err = "[SKIPPED] Task Management function" + "for WarmReset is not working/implemented\n"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } + logging(LOG_VERBOSE, "Wait until all unit attentions clear"); while (testunitready(sd, EXPECT_STATUS_GOOD) != 0) ;