From b2b474f3ad945f168ca0de944fd909e507c051f3 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 12 May 2015 20:17:50 -0700 Subject: [PATCH] TESTS: Allow inquiry(block dev characteristics) to fail Signed-off-by: Ronnie Sahlberg --- test-tool/iscsi-test-cu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index ae236b2..516832c 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -1179,13 +1179,11 @@ main(int argc, char *argv[]) } /* try reading block device characteristics vpd */ - inq_bdc_task = NULL; inquiry(sd, &inq_bdc_task, 1, SCSI_INQUIRY_PAGECODE_BLOCK_DEVICE_CHARACTERISTICS, 255, EXPECT_STATUS_GOOD); - if (inq_bdc_task == NULL) { + if (inq_bdc_task == NULL || inq_bdc_task->status != SCSI_STATUS_GOOD) { printf("Failed to read Block Device Characteristics page\n"); - } - if (inq_bdc_task) { + } else { inq_bdc = scsi_datain_unmarshall(inq_bdc_task); if (inq_bdc == NULL) { printf("failed to unmarshall inquiry datain blob\n");