nvme: clean up test_nvme_completion_is_retry

Remove unnecessary allocation (which was missing the corresponding free
call).

Simplify code to avoid unnecessary ret_val variable.

Change-Id: I267e90d8744bf04907c610f0ff6899de7dddca71
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2015-09-22 15:58:35 -07:00
parent 8217814218
commit 25f0056e9b

View File

@ -310,88 +310,63 @@ void test_nvme_qpair_destroy(void)
void test_nvme_completion_is_retry(void) void test_nvme_completion_is_retry(void)
{ {
struct nvme_completion *cpl = NULL; struct nvme_completion cpl = {};
uint64_t phys_addr = 0;
bool ret_val = false;
cpl = nvme_malloc("nvme_completion", sizeof(struct nvme_completion), cpl.status.sct = NVME_SCT_GENERIC;
64, &phys_addr); cpl.status.sc = NVME_SC_ABORTED_BY_REQUEST;
cpl.status.dnr = 0;
CU_ASSERT_TRUE(nvme_completion_is_retry(&cpl));
cpl->status.sct = NVME_SCT_GENERIC; cpl.status.sc = NVME_SC_INVALID_OPCODE;
cpl->status.sc = NVME_SC_ABORTED_BY_REQUEST; CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
cpl->status.dnr = 0;
ret_val = nvme_completion_is_retry(cpl);
CU_ASSERT_TRUE(ret_val);
cpl->status.sc = NVME_SC_INVALID_OPCODE; cpl.status.sc = NVME_SC_INVALID_FIELD;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_INVALID_FIELD; cpl.status.sc = NVME_SC_COMMAND_ID_CONFLICT;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_COMMAND_ID_CONFLICT; cpl.status.sc = NVME_SC_DATA_TRANSFER_ERROR;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_DATA_TRANSFER_ERROR; cpl.status.sc = NVME_SC_ABORTED_POWER_LOSS;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_ABORTED_POWER_LOSS; cpl.status.sc = NVME_SC_INTERNAL_DEVICE_ERROR;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_INTERNAL_DEVICE_ERROR; cpl.status.sc = NVME_SC_ABORTED_FAILED_FUSED;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_ABORTED_FAILED_FUSED; cpl.status.sc = NVME_SC_ABORTED_MISSING_FUSED;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_ABORTED_MISSING_FUSED; cpl.status.sc = NVME_SC_INVALID_NAMESPACE_OR_FORMAT;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_INVALID_NAMESPACE_OR_FORMAT; cpl.status.sc = NVME_SC_COMMAND_SEQUENCE_ERROR;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_COMMAND_SEQUENCE_ERROR; cpl.status.sc = NVME_SC_LBA_OUT_OF_RANGE;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_LBA_OUT_OF_RANGE; cpl.status.sc = NVME_SC_CAPACITY_EXCEEDED;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = NVME_SC_CAPACITY_EXCEEDED; cpl.status.sc = 0x70;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sc = 0x70; cpl.status.sct = NVME_SCT_COMMAND_SPECIFIC;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sct = NVME_SCT_COMMAND_SPECIFIC; cpl.status.sct = NVME_SCT_MEDIA_ERROR;
ret_val = nvme_completion_is_retry(cpl); CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
CU_ASSERT_FALSE(ret_val);
cpl->status.sct = NVME_SCT_MEDIA_ERROR;
ret_val = nvme_completion_is_retry(cpl);
CU_ASSERT_FALSE(ret_val);
cpl->status.sct = NVME_SCT_VENDOR_SPECIFIC;
ret_val = nvme_completion_is_retry(cpl);
CU_ASSERT_FALSE(ret_val);
cpl->status.sct = 0x4;
ret_val = nvme_completion_is_retry(cpl);
CU_ASSERT_FALSE(ret_val);
cpl.status.sct = NVME_SCT_VENDOR_SPECIFIC;
CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
cpl.status.sct = 0x4;
CU_ASSERT_FALSE(nvme_completion_is_retry(&cpl));
} }
int main(int argc, char **argv) int main(int argc, char **argv)