External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

storagevolxml2argvtest: Report better error messages on test failure

Browse Source 
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.
This commit is contained in:
Peter Krempa 2013-06-05 10:49:15 +02:00
parent 1add9c78da
commit b922c3d51a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/storagevolxml2argvtest.c
View File

@ -60,9 +60,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
cmd = virStorageBackendCreateQemuImgCmd(conn, &poolobj, vol, inputvol, cmd = virStorageBackendCreateQemuImgCmd(conn, &poolobj, vol, inputvol,
flags, create_tool, imgformat); flags, create_tool, imgformat);
if (!cmd) {
actualCmdline = virCommandToString(cmd);
if (!actualCmdline) {
if (shouldFail) { if (shouldFail) {
virResetLastError(); virResetLastError();
ret = 0; ret = 0;
@ -70,6 +68,9 @@ testCompareXMLToArgvFiles(bool shouldFail,
goto cleanup; goto cleanup;
} }
if (!(actualCmdline = virCommandToString(cmd)))
goto cleanup;
len = virtTestLoadFile(cmdline, &expectedCmdline); len = virtTestLoadFile(cmdline, &expectedCmdline);
if (len < 0) if (len < 0)
goto cleanup; goto cleanup;