External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: use virtTestDifferenceFull in tests where we have output file

Browse Source 
This will enable regenerate functionality for those tests to make
developer lives easier while updating tests.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-12-10 14:12:13 +01:00
parent c7f5e26b5f
commit 2d446b6eeb
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/domainsnapshotxml2xmltest.c
View File

@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml,
} }
if (STRNEQ(outXmlData, actual)) { if (STRNEQ(outXmlData, actual)) {
virtTestDifference(stderr, outXmlData, actual); virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
goto cleanup; goto cleanup;
} }

2
tests/interfacexml2xmltest.c
View File

@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail; goto fail;
if (STRNEQ(xmlData, actual)) { if (STRNEQ(xmlData, actual)) {
virtTestDifference(stderr, xmlData, actual); virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail; goto fail;
} }

2
tests/lxcconf2xmltest.c
View File

@ -51,7 +51,7 @@ testCompareXMLToConfigFiles(const char *xml,
goto fail; goto fail;
if (STRNEQ(expectxml, actualxml)) { if (STRNEQ(expectxml, actualxml)) {
virtTestDifference(stderr, expectxml, actualxml); virtTestDifferenceFull(stderr, expectxml, xml, actualxml, NULL);
goto fail; goto fail;
} }
} }

2
tests/nodedevxml2xmltest.c
View File

@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail; goto fail;
if (STRNEQ(xmlData, actual)) { if (STRNEQ(xmlData, actual)) {
virtTestDifference(stderr, xmlData, actual); virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail; goto fail;
} }

11
tests/qemuhotplugtest.c
View File

@ -175,6 +175,7 @@ testQemuHotplugUpdate(virDomainObjPtr vm,
static int static int
testQemuHotplugCheckResult(virDomainObjPtr vm, testQemuHotplugCheckResult(virDomainObjPtr vm,
const char *expected, const char *expected,
const char *expectedFile,
bool fail) bool fail)
{ {
char *actual; char *actual;
@ -192,7 +193,9 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
ret = 0; ret = 0;
} else { } else {
if (!fail) if (!fail)
virtTestDifference(stderr, expected, actual); virtTestDifferenceFull(stderr,
expected, expectedFile,
actual, NULL);
ret = -1; ret = -1;
} }
@ -294,13 +297,15 @@ testQemuHotplug(const void *data)
VIR_FREE(dev); VIR_FREE(dev);
} }
if (ret == 0 || fail) if (ret == 0 || fail)
ret = testQemuHotplugCheckResult(vm, result_xml, fail); ret = testQemuHotplugCheckResult(vm, result_xml,
result_filename, fail);
break; break;
case DETACH: case DETACH:
ret = testQemuHotplugDetach(vm, dev); ret = testQemuHotplugDetach(vm, dev);
if (ret == 0 || fail) if (ret == 0 || fail)
ret = testQemuHotplugCheckResult(vm, domain_xml, fail); ret = testQemuHotplugCheckResult(vm, domain_xml,
domain_filename, fail);
break; break;
case UPDATE: case UPDATE: