From f7ea45e053b8eb6ce4ba26dd85be6e4f94a46cdb Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 19 Sep 2015 15:47:13 -0700 Subject: [PATCH] TESTS: ReportSuppOpcodes, handle broken targets that return success but no data. Signed-off-by: Ronnie Sahlberg --- test-tool/test_report_supported_opcodes_one_command.c | 8 +++++++- test-tool/test_report_supported_opcodes_rctd.c | 8 +++++++- test-tool/test_report_supported_opcodes_servactv.c | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/test-tool/test_report_supported_opcodes_one_command.c b/test-tool/test_report_supported_opcodes_one_command.c index 6e22138..d945373 100644 --- a/test-tool/test_report_supported_opcodes_one_command.c +++ b/test-tool/test_report_supported_opcodes_one_command.c @@ -59,7 +59,13 @@ test_report_supported_opcodes_one_command(void) logging(LOG_VERBOSE, "Unmarshall the DATA-IN buffer"); rsoc = scsi_datain_unmarshall(rso_task); CU_ASSERT_NOT_EQUAL(rsoc, NULL); - + if (!rsoc) { + logging(LOG_NORMAL, "[FAILED] Target did not return any data " + "for ReportSupportedOpcodes\n"); + CU_FAIL("Target did not return any data for " + "ReportSupportedOpcodes"); + return; + } logging(LOG_VERBOSE, "Verify read one-command works for all supported " "opcodes"); diff --git a/test-tool/test_report_supported_opcodes_rctd.c b/test-tool/test_report_supported_opcodes_rctd.c index 9e42db8..99b152f 100644 --- a/test-tool/test_report_supported_opcodes_rctd.c +++ b/test-tool/test_report_supported_opcodes_rctd.c @@ -59,7 +59,13 @@ test_report_supported_opcodes_rctd(void) logging(LOG_VERBOSE, "Unmarshall the DATA-IN buffer"); rsoc = scsi_datain_unmarshall(rso_task); CU_ASSERT_NOT_EQUAL(rsoc, NULL); - + if (!rsoc) { + logging(LOG_NORMAL, "[FAILED] Target did not return any data " + "for ReportSupportedOpcodes\n"); + CU_FAIL("Target did not return any data for " + "ReportSupportedOpcodes"); + return; + } logging(LOG_VERBOSE, "Verify that all returned command descriptors " "lack timeout description"); diff --git a/test-tool/test_report_supported_opcodes_servactv.c b/test-tool/test_report_supported_opcodes_servactv.c index 307f373..d327c83 100644 --- a/test-tool/test_report_supported_opcodes_servactv.c +++ b/test-tool/test_report_supported_opcodes_servactv.c @@ -57,6 +57,13 @@ test_report_supported_opcodes_servactv(void) logging(LOG_VERBOSE, "Unmarshall the DATA-IN buffer"); rsoc = scsi_datain_unmarshall(rso_task); CU_ASSERT_NOT_EQUAL(rsoc, NULL); + if (!rsoc) { + logging(LOG_NORMAL, "[FAILED] Target did not return any data " + "for ReportSupportedOpcodes\n"); + CU_FAIL("Target did not return any data for " + "ReportSupportedOpcodes"); + return; + } logging(LOG_VERBOSE, "Verify that when SERVACTV is clear then "