From 645c92297a258ed80cbbcf2d97f14c5c543e07e8 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 29 Nov 2010 14:11:53 +0100
Subject: [PATCH] tests: Fix detection of expected errors

---
 tests/nwfilterxml2xmltest.c | 15 +++++----------
 tests/qemuxml2argvtest.c    |  8 +++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 070aa98a7d..9cad9130ad 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;
 
+    virResetLastError();
+
     if (!(dev = virNWFilterDefParseString(NULL, inXmlData)))
         goto fail;
 
-    if ((log = virtTestLogContentAndReset()) == NULL)
+    if (!!virGetLastError() != expect_error)
         goto fail;
 
-    if ((*log != '\0') != expect_warning) {
-        free(log);
-        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 b149ef4272..c5e04486d1 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;
     }