From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Jun 2013 08:49:15 +0000 (+0200)
Subject: storagevolxml2argvtest: Report better error messages on test failure
X-Git-Tag: v1.1.0-rc1~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b922c3d51a5947085500cece433ef7b1bdabdeb8;p=thirdparty%2Flibvirt.git

storagevolxml2argvtest: Report better error messages on test failure

If the creation of the commandline failed, libvirt always reported "out
of memory" from the virCommandToString function rather than the proper
error that happened in virStorageBackendCreateQemuImgCmd. Error out
earlier.
---

diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index e1507b4495..92ab2f2a52 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -60,9 +60,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
 
     cmd = virStorageBackendCreateQemuImgCmd(conn, &poolobj, vol, inputvol,
                                             flags, create_tool, imgformat);
-
-    actualCmdline = virCommandToString(cmd);
-    if (!actualCmdline) {
+    if (!cmd) {
         if (shouldFail) {
             virResetLastError();
             ret = 0;
@@ -70,6 +68,9 @@ testCompareXMLToArgvFiles(bool shouldFail,
         goto cleanup;
     }
 
+    if (!(actualCmdline = virCommandToString(cmd)))
+        goto cleanup;
+
     len = virtTestLoadFile(cmdline, &expectedCmdline);
     if (len < 0)
         goto cleanup;