From 394eaa6b394e1f5b21aaeb950243d9acd06030ed Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Mon, 18 Dec 2017 07:41:16 -0500 Subject: [PATCH] test: Use virStoragePoolObjIsDuplicate for storage define/create Avoid the chance that there could be a duplicate storage pool UUID or Name from the test driver storage pool define/create functions. --- src/test/test_driver.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8adc2167b4..dc743b4988 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4440,14 +4440,8 @@ testStoragePoolCreateXML(virConnectPtr conn, if (!(newDef = virStoragePoolDefParseString(xml))) goto cleanup; - obj = virStoragePoolObjFindByUUID(privconn->pools, newDef->uuid); - if (!obj) - obj = virStoragePoolObjFindByName(privconn->pools, newDef->name); - if (obj) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("storage pool already exists")); + if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, true) < 0) goto cleanup; - } if (!(obj = virStoragePoolObjAssignDef(privconn->pools, newDef))) goto cleanup; @@ -4520,6 +4514,9 @@ testStoragePoolDefineXML(virConnectPtr conn, newDef->allocation = defaultPoolAlloc; newDef->available = defaultPoolCap - defaultPoolAlloc; + if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, false) < 0) + goto cleanup; + if (!(obj = virStoragePoolObjAssignDef(privconn->pools, newDef))) goto cleanup; newDef = NULL;