From 49c89fa70e332ae5e2bfc815e6465bf7969f3092 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 25 Jan 2021 14:57:35 +0100 Subject: [PATCH] test: storage: Remove double testing in testStorageLookup The function attempts two calls to virStorageSourceChainLookup to see whether the function handles NULL correctly. This isn't very useful and additionally upcoming patch will remove the 'idx' parameter thus the test becomes obsolete. Remove it. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/virstoragetest.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 0e168ce730..99007dd662 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -365,36 +365,6 @@ testStorageLookup(const void *args) ret = -1; } - /* Test twice to ensure optional parameter doesn't cause NULL deref. */ - result = virStorageSourceChainLookup(data->chain, data->from, - idx ? NULL : data->name, - idx, NULL); - - if (!data->expResult) { - if (virGetLastErrorCode() == VIR_ERR_OK) { - fprintf(stderr, "call should have failed\n"); - ret = -1; - } - virResetLastError(); - } else { - if (virGetLastErrorCode()) { - fprintf(stderr, "call should not have warned\n"); - ret = -1; - } - } - - if (!result) { - if (data->expResult) { - fprintf(stderr, "result 1: expected %s, got NULL\n", - data->expResult); - ret = -1; - } - } else if (STRNEQ_NULLABLE(data->expResult, result->path)) { - fprintf(stderr, "result 1: expected %s, got %s\n", - NULLSTR(data->expResult), NULLSTR(result->path)); - ret = -1; - } - result = virStorageSourceChainLookup(data->chain, data->from, data->name, idx, &actualParent); if (!data->expResult) @@ -402,12 +372,12 @@ testStorageLookup(const void *args) if (!result) { if (data->expResult) { - fprintf(stderr, "result 2: expected %s, got NULL\n", + fprintf(stderr, "result: expected %s, got NULL\n", data->expResult); ret = -1; } } else if (STRNEQ_NULLABLE(data->expResult, result->path)) { - fprintf(stderr, "result 2: expected %s, got %s\n", + fprintf(stderr, "result: expected %s, got %s\n", NULLSTR(data->expResult), NULLSTR(result->path)); ret = -1; }