From d9352865c2cddf8811c71f9c96e6c01b4de6a2b8 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 12 May 2015 20:30:04 -0700 Subject: [PATCH] TESTS: Skip the test with a warning if BlockDevChar VPD page is missing Signed-off-by: Ronnie Sahlberg --- test-tool/test_modesense6_control_d_sense.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test-tool/test_modesense6_control_d_sense.c b/test-tool/test_modesense6_control_d_sense.c index 5e17913..5a8c31c 100644 --- a/test-tool/test_modesense6_control_d_sense.c +++ b/test-tool/test_modesense6_control_d_sense.c @@ -41,7 +41,11 @@ test_modesense6_control_d_sense(void) ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_CONTROL, 0, 255, EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + if (ret != 0) { + logging(LOG_NORMAL,"[WARNING] Could not read " + "BlockDeviceCharacteristics."); + goto finished; + } logging(LOG_VERBOSE, "[SUCCESS] CONTROL page fetched."); logging(LOG_VERBOSE, "Try to unmarshall the DATA-IN buffer.");