diff options
| author |   Jiri Denemark <jdenemar@redhat.com> | 2010-11-29 14:11:53 +0100 |
|---|---|---|
| committer | Jiri Denemark <jdenemar@redhat.com> | 2010-11-29 16:35:20 +0100 |
| commit | 645c92297a258ed80cbbcf2d97f14c5c543e07e8 (patch) | |
| tree | 764a5a7518c8f5b90869182870d9711e2f20bbcc | |
| parent | docs: updated c# bindings with arnauds latest changes (diff) | |
| download | libvirt-645c92297a258ed80cbbcf2d97f14c5c543e07e8.tar.gz libvirt-645c92297a258ed80cbbcf2d97f14c5c543e07e8.tar.bz2 libvirt-645c92297a258ed80cbbcf2d97f14c5c543e07e8.zip | |
tests: Fix detection of expected errors
| -rw-r--r-- | tests/nwfilterxml2xmltest.c | 15 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 8 |
2 files changed, 8 insertions, 15 deletions
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 070aa98a7..9cad9130a 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -25,7 +25,7 @@ static char *abs_srcdir; static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml, - bool expect_warning) { + bool expect_error) { char inXmlData[MAX_FILE]; char *inXmlPtr = &(inXmlData[0]); char outXmlData[MAX_FILE]; @@ -33,26 +33,21 @@ static int testCompareXMLToXMLFiles(const char *inxml, char *actual = NULL; int ret = -1; virNWFilterDefPtr dev = NULL; - char *log; if (virtTestLoadFile(inxml, &inXmlPtr, MAX_FILE) < 0) goto fail; if (virtTestLoadFile(outxml, &outXmlPtr, MAX_FILE) < 0) goto fail; - if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) - goto fail; + virResetLastError(); - if ((log = virtTestLogContentAndReset()) == NULL) + if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) goto fail; - if ((*log != '\0') != expect_warning) { - free(log); + if (!!virGetLastError() != expect_error) goto fail; - } - free(log); - if (expect_warning) { + if (expect_error) { /* need to suppress the errors */ virResetLastError(); } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b149ef427..c5e04486d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -84,6 +84,7 @@ static int testCompareXMLToArgvFiles(const char *xml, free(virtTestLogContentAndReset()); + virResetLastError(); if (qemudBuildCommandLine(conn, &driver, vmdef, &monitor_chr, 0, flags, @@ -91,11 +92,8 @@ static int testCompareXMLToArgvFiles(const char *xml, NULL, NULL, migrateFrom, NULL) < 0) goto fail; - if ((log = virtTestLogContentAndReset()) == NULL) - goto fail; - - if (!!strstr(log, ": error :") != expectError) { - if (virTestGetDebug()) + if (!!virGetLastError() != expectError) { + if (virTestGetDebug() && (log = virtTestLogContentAndReset())) fprintf(stderr, "\n%s", log); goto fail; } |