mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
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>
This commit is contained in:
parent
06d7151664
commit
eba7491c59
@ -1,3 +1,5 @@
|
||||
mount \
|
||||
-o nodev,nosuid,noexec \
|
||||
-t ext3 /dev/sda6 /mnt
|
||||
-t ext3 \
|
||||
/dev/sda6 \
|
||||
/mnt
|
||||
|
@ -1 +1,4 @@
|
||||
mount -t ext3 /dev/sda6 /mnt
|
||||
mount \
|
||||
-t ext3 \
|
||||
/dev/sda6 \
|
||||
/mnt
|
||||
|
@ -1 +1,2 @@
|
||||
vgchange -aly HostVG
|
||||
vgchange \
|
||||
-aly HostVG
|
||||
|
@ -1 +1,2 @@
|
||||
vgchange -aly zily
|
||||
vgchange \
|
||||
-aly zily
|
||||
|
@ -1 +1,2 @@
|
||||
vgchange -aly HostVG
|
||||
vgchange \
|
||||
-aly HostVG
|
||||
|
@ -1 +1,2 @@
|
||||
vgchange -aly HostVG
|
||||
vgchange \
|
||||
-aly HostVG
|
||||
|
@ -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
|
||||
|
@ -1 +1,3 @@
|
||||
mount localhost:/var/lib/libvirt/images /mnt
|
||||
mount \
|
||||
localhost:/var/lib/libvirt/images \
|
||||
/mnt
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1,4 @@
|
||||
mount -t nfs localhost:/var/lib/libvirt/images /mnt
|
||||
mount \
|
||||
-t nfs \
|
||||
localhost:/var/lib/libvirt/images \
|
||||
/mnt
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user