NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add virtTestCompareToFile

Browse Source 
Replaces a common pattern used in many test files
This commit is contained in:
Cole Robinson
2015-04-23 11:14:26 -04:00
parent bdbe26b504
commit ca32929908
32 changed files with 78 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/nwfilterxml2firewalltest.c
View File

@@ -372,8 +372,6 @@ static int testSetDefaultParameters(virNWFilterHashTablePtr vars)
static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline)
{
char *expectargv = NULL;
int len;
char *actualargv = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
virNWFilterHashTablePtr vars = virNWFilterHashTableCreate(0);
@@ -407,20 +405,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
testRemoveCommonRules(actualargv);
len = virtTestLoadFile(cmdline, &expectargv);
if (len < 0)
if (virtTestCompareToFile(actualargv, cmdline) < 0)
goto cleanup;
if (STRNEQ(expectargv, actualargv)) {
virtTestDifference(stderr, expectargv, actualargv);
goto cleanup;
}
ret = 0;
cleanup:
virBufferFreeAndReset(&buf);
VIR_FREE(expectargv);
VIR_FREE(actualargv);
virNWFilterInstReset(&inst);
virNWFilterHashTableFree(vars);