External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove superfluous cleanup: labels and ret return variables

Browse Source 
After converting virNetworkDef * to g_autoptr(virNetworkDef) the
cleanup codepath was empty, so it has been removed.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2022-08-18 13:29:07 -04:00
parent 9a64c66d34
commit 15bd9179be
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/networkxml2firewalltest.c
View File

@ -90,17 +90,16 @@ static int testCompareXMLToArgvFiles(const char *xml,
g_autofree char *actualargv = NULL;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autoptr(virNetworkDef) def = NULL;
int ret = -1;
char *actual;
g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
virCommandSetDryRun(dryRunToken, &buf, true, true, testCommandDryRun, NULL);
if (!(def = virNetworkDefParseFile(xml, NULL)))
goto cleanup;
return -1;
if (networkAddFirewallRules(def) < 0)
goto cleanup;
return -1;
actual = actualargv = virBufferContentAndReset(&buf);
@ -112,12 +111,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
actual += strlen(baseargs);
if (virTestCompareToFileFull(actual, cmdline, false) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
return ret;
return 0;
}
struct testInfo {

5
tests/networkxml2xmlupdatetest.c
View File

@ -23,7 +23,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
g_autoptr(virNetworkDef) def = NULL;
if (virTestLoadFile(updatexml, &updateXmlData) < 0)
goto error;
return -1;
if (!(def = virNetworkDefParseFile(netxml, NULL)))
goto fail;
@ -37,7 +37,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
if (!expectFailure) {
if (virTestCompareToFile(actual, outxml) < 0)
goto error;
return -1;
}
ret = 0;
@ -52,7 +52,6 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
ret = 0;
}
}
error:
return ret;
}