From 3b8b42d976d60631e93b18440e6de118cf0fe599 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 2 Aug 2015 12:37:07 -0700 Subject: [PATCH] TESTS: Add missing check for not supported : RECEIVE_COPY_RESULTS Signed-off-by: Ronnie Sahlberg --- test-tool/test_extendedcopy_descr_limits.c | 5 +++++ test-tool/test_receive_copy_results_copy_status.c | 7 ++++++- test-tool/test_receive_copy_results_op_params.c | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test-tool/test_extendedcopy_descr_limits.c b/test-tool/test_extendedcopy_descr_limits.c index 53e96d2..8474c6c 100644 --- a/test-tool/test_extendedcopy_descr_limits.c +++ b/test-tool/test_extendedcopy_descr_limits.c @@ -66,6 +66,11 @@ test_extendedcopy_descr_limits(void) logging(LOG_VERBOSE, "Issue RECEIVE COPY RESULTS (OPERATING PARAMS)"); ret = receive_copy_results(sd, SCSI_COPY_RESULTS_OP_PARAMS, 0, (void **)&opp, EXPECT_STATUS_GOOD); + if (ret == -2) { + CU_PASS("[SKIPPED] Target does not support " + "RECEIVE_COPY_RESULTS. Skipping test"); + return; + } CU_ASSERT_EQUAL(ret, 0); /* Allocate buffer to accommodate (MAX+1) target and diff --git a/test-tool/test_receive_copy_results_copy_status.c b/test-tool/test_receive_copy_results_copy_status.c index d8dd95c..d76d01e 100644 --- a/test-tool/test_receive_copy_results_copy_status.c +++ b/test-tool/test_receive_copy_results_copy_status.c @@ -42,6 +42,11 @@ test_receive_copy_results_copy_status(void) logging(LOG_VERBOSE, "No copy in progress"); ret = receive_copy_results(sd, SCSI_COPY_RESULTS_COPY_STATUS, list_id, NULL, EXPECT_INVALID_FIELD_IN_CDB); + if (ret == -2) { + CU_PASS("[SKIPPED] Target does not support " + "RECEIVE_COPY_STATUS. Skipping test"); + return; + } CU_ASSERT_EQUAL(ret, 0); CHECK_FOR_DATALOSS; @@ -58,7 +63,7 @@ test_receive_copy_results_copy_status(void) LU_ID_TYPE_LUN, 0, 0, 0, 0, sd); tgt_desc_len = offset - XCOPY_DESC_OFFSET; - /* Iniitialize segment descriptor list with one segment descriptor */ + /* Initialize segment descriptor list with one segment descriptor */ offset += populate_seg_desc_b2b(xcopybuf+offset, 0, 0, 0, 0, 2048, 0, num_blocks - 2048); seg_desc_len = offset - XCOPY_DESC_OFFSET - tgt_desc_len; diff --git a/test-tool/test_receive_copy_results_op_params.c b/test-tool/test_receive_copy_results_op_params.c index 4f8e151..ff9b6f7 100644 --- a/test-tool/test_receive_copy_results_op_params.c +++ b/test-tool/test_receive_copy_results_op_params.c @@ -37,6 +37,10 @@ test_receive_copy_results_op_params(void) ret = receive_copy_results(sd, SCSI_COPY_RESULTS_OP_PARAMS, 0, (void **)&opp, EXPECT_STATUS_GOOD); + if (ret == -2) { + CU_PASS("[SKIPPED] RECEIVE_COPY_RESULT is not implemented."); + return; + } CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL,