storagepoolxml2argvtest: Use internal wrapping of command line arguments

virCommandToString has the possibility to return an already wrapped
string with better format than what we get from the test wrapper script.

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/storagepoolxml2argvdata/pool-fs-linux.argv b/tests/storagepoolxml2argvdata/pool-fs-linux.argv
index 6d014320cf4683e712d6a8536fafd1b58d79e547..99cc8ee77fcfdc7137dd7ca29c264fb3dd79442b 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-fs-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-fs-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec \
--t ext3 /dev/sda6 /mnt
+-t ext3 \
+/dev/sda6 \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-fs.argv b/tests/storagepoolxml2argvdata/pool-fs.argv
index 537ce4cee50133af00a60dac1c5d703c65c03fae..8254863b5737369f72c42a693390b531bc80cdfd 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-fs.argv
+++ b/tests/storagepoolxml2argvdata/pool-fs.argv
@@ -1 +1,4 @@
-mount -t ext3 /dev/sda6 /mnt
+mount \
+-t ext3 \
+/dev/sda6 \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-logical-create.argv b/tests/storagepoolxml2argvdata/pool-logical-create.argv
index 8c7f8c93f99e6b87f602475e81efc2dd739f96fb..e22c05beb9283214009eacd8bedc2a424f46ec94 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-logical-create.argv
+++ b/tests/storagepoolxml2argvdata/pool-logical-create.argv
@@ -1 +1,2 @@
-vgchange -aly HostVG
+vgchange \
+-aly HostVG

diff --git a/tests/storagepoolxml2argvdata/pool-logical-noname.argv b/tests/storagepoolxml2argvdata/pool-logical-noname.argv
index 9f7eda00bd0fea45c8c417815e217fa4706a46bd..90fa7b6f02eaee1813b8e542f87b03d0c5189b27 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-logical-noname.argv
+++ b/tests/storagepoolxml2argvdata/pool-logical-noname.argv
@@ -1 +1,2 @@
-vgchange -aly zily
+vgchange \
+-aly zily

diff --git a/tests/storagepoolxml2argvdata/pool-logical-nopath.argv b/tests/storagepoolxml2argvdata/pool-logical-nopath.argv
index 8c7f8c93f99e6b87f602475e81efc2dd739f96fb..e22c05beb9283214009eacd8bedc2a424f46ec94 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-logical-nopath.argv
+++ b/tests/storagepoolxml2argvdata/pool-logical-nopath.argv
@@ -1 +1,2 @@
-vgchange -aly HostVG
+vgchange \
+-aly HostVG

diff --git a/tests/storagepoolxml2argvdata/pool-logical.argv b/tests/storagepoolxml2argvdata/pool-logical.argv
index 8c7f8c93f99e6b87f602475e81efc2dd739f96fb..e22c05beb9283214009eacd8bedc2a424f46ec94 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-logical.argv
+++ b/tests/storagepoolxml2argvdata/pool-logical.argv
@@ -1 +1,2 @@
-vgchange -aly HostVG
+vgchange \
+-aly HostVG

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv
index b5e455090a27b21e6d45a4ce993e4ea1cac250bc..9974aea273e339f0d548a2fda8630efe663df221 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv
@@ -1,2 +1,4 @@
 mount \
--o nodev,nosuid,noexec localhost:/var/lib/libvirt/images /mnt
+-o nodev,nosuid,noexec \
+localhost:/var/lib/libvirt/images \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto.argv b/tests/storagepoolxml2argvdata/pool-netfs-auto.argv
index 888a0161b84e8bb24d7696e92fad14b1e9063e86..e49233cd93a80f44b65f944824511c0cb2563e25 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-auto.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-auto.argv
@@ -1 +1,3 @@
-mount localhost:/var/lib/libvirt/images /mnt
+mount \
+localhost:/var/lib/libvirt/images \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv
index feb20d7bc8a5c4b89d5fd89a62b84a08a904f887..3432ab11bd8750404fbb146efef26c14cd2f1164 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec,guest \
--t cifs //example.com/samba_share /mnt/cifs
+-t cifs \
+//example.com/samba_share \
+/mnt/cifs

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv
index 4524bc921aaf088b6a3d16c2e1332694398262f1..e622e0eb95c6195a8c9c2b5603ce70f3b630ff07 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec,direct-io-mode=1 \
--t glusterfs example.com:/volume /mnt/gluster
+-t glusterfs \
+example.com:/volume \
+/mnt/gluster

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-linux.argv
index ce0d88cfacecced739fbbef7eae992530b21c3c7..4012b04d7db244fe453f71a3d8709b48e5d822f8 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec \
--t nfs localhost:/var/lib/libvirt/images /mnt
+-t nfs \
+localhost:/var/lib/libvirt/images \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv
index 517fdbb0803c705ecc9f6fa97f9b2780da077e65..433b39d0e23e759c5ba98f1e02c5a691c92b780d 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec,nfsvers=3,sync,lazytime \
--t nfs localhost:/var/lib/libvirt/images /mnt
+-t nfs \
+localhost:/var/lib/libvirt/images \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
index fc1d91c614f92a649c8587aa6955c883770a4f93..dac46a074ff78de2ec51a36bf4c47b629c465799 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
@@ -1,3 +1,5 @@
 mount \
 -o nodev,nosuid,noexec,nfsvers=3 \
--t nfs localhost:/var/lib/libvirt/images /mnt
+-t nfs \
+localhost:/var/lib/libvirt/images \
+/mnt

diff --git a/tests/storagepoolxml2argvdata/pool-netfs.argv b/tests/storagepoolxml2argvdata/pool-netfs.argv
index 04127c50877b61ac32727da551e4640733b8c788..0ed31b642b885e6c1babb45264bda247c11d3d78 100644 (file)
--- a/tests/storagepoolxml2argvdata/pool-netfs.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs.argv
@@ -1 +1,4 @@
-mount -t nfs localhost:/var/lib/libvirt/images /mnt
+mount \
+-t nfs \
+localhost:/var/lib/libvirt/images \
+/mnt

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