From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 6 Apr 2021 16:38:57 +0000 (+0200)
Subject: tests: storagepoolxml2argvtest: Use integrated command path stripping
X-Git-Tag: v7.3.0-rc1~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070cc66d1655271d0e3ad3ac5a3aad7c546d3f1f;p=thirdparty%2Flibvirt.git

tests: storagepoolxml2argvtest: Use integrated command path stripping

Replace virTestClearCommandPath by virCommandToStringFull which allows
to strip the command prefix internally.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c
index 967d1f21a8..0279437f63 100644
--- a/tests/storagepoolxml2argvtest.c
+++ b/tests/storagepoolxml2argvtest.c
@@ -74,12 +74,11 @@ testCompareXMLToArgvFiles(bool shouldFail,
         goto cleanup;
     };
 
-    if (!(actualCmdline = virCommandToString(cmd, false))) {
+    if (!(actualCmdline = virCommandToStringFull(cmd, false, true))) {
         VIR_TEST_DEBUG("pool type '%s' failed to get commandline", defTypeStr);
         goto cleanup;
     }
 
-    virTestClearCommandPath(actualCmdline);
     if (virTestCompareToFile(actualCmdline, cmdline) < 0)
         goto cleanup;