storagevolxml2argvtest: 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/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv
index 203f27ca22851c5fd73d5a6d93836bc165e1e296..16e0e91a4c7aba82d6c9eb132eb568453aa22b96 100644 (file)
--- a/tests/storagevolxml2argvdata/iso-input.argv
+++ b/tests/storagevolxml2argvdata/iso-input.argv
@@ -1,4 +1,6 @@
 qemu-img \
 convert \
 -f raw \
--O raw /var/lib/libvirt/images/test.iso /var/lib/libvirt/images/sparse.img
+-O raw \
+/var/lib/libvirt/images/test.iso \
+/var/lib/libvirt/images/sparse.img

diff --git a/tests/storagevolxml2argvdata/iso.argv b/tests/storagevolxml2argvdata/iso.argv
index f74505ececbf4bead6fb987ec6a1d2d05ec7a000..52b29a51c252d8457f2da3a1116097869bfdee72 100644 (file)
--- a/tests/storagevolxml2argvdata/iso.argv
+++ b/tests/storagevolxml2argvdata/iso.argv
@@ -1,3 +1,5 @@
 qemu-img \
 create \
--f raw /var/lib/libvirt/images/test.iso 1024K
+-f raw \
+/var/lib/libvirt/images/test.iso \
+1024K

diff --git a/tests/storagevolxml2argvdata/logical-from-qcow2.argv b/tests/storagevolxml2argvdata/logical-from-qcow2.argv
index c1b3cef4b9d6a383591ab57639ab2e879edd05d2..3da4dada9b80af1885e13aacc9ce4d4c8b6bc2b4 100644 (file)
--- a/tests/storagevolxml2argvdata/logical-from-qcow2.argv
+++ b/tests/storagevolxml2argvdata/logical-from-qcow2.argv
@@ -1,4 +1,6 @@
 qemu-img \
 convert \
 -f qcow2 \
--O raw /var/lib/libvirt/images/OtherDemo.img /dev/HostVG/Swap
+-O raw \
+/var/lib/libvirt/images/OtherDemo.img \
+/dev/HostVG/Swap

diff --git a/tests/storagevolxml2argvdata/luks-cipher.argv b/tests/storagevolxml2argvdata/luks-cipher.argv
index bb4438949c2eba172d792b24b9a55e2671b21481..f48201818234c8f7b9f8fecc87643de0e8213e81 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-cipher.argv
+++ b/tests/storagevolxml2argvdata/luks-cipher.argv
@@ -2,6 +2,6 @@ qemu-img \
 create \
 -f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=LuksDemo.img_encrypt0,cipher-alg=serpent-256,cipher-mode=cbc,\
-hash-alg=sha256,ivgen-alg=plain64,\
-ivgen-hash-alg=sha256 /var/lib/libvirt/images/LuksDemo.img 5242880K
+-o key-secret=LuksDemo.img_encrypt0,cipher-alg=serpent-256,cipher-mode=cbc,hash-alg=sha256,ivgen-alg=plain64,ivgen-hash-alg=sha256 \
+/var/lib/libvirt/images/LuksDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
index 456ae621d1f55662a9bb2c7f6bab06d16ec2e39b..307e08c9b41d00325ff8c9a90a65f089519855a7 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
@@ -2,7 +2,8 @@ qemu-img \
 create \
 -f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \
+-o key-secret=LuksDemo.img_encrypt0 \
+/var/lib/libvirt/images/LuksDemo.img \
 5242880K
 qemu-img \
 convert \
@@ -10,9 +11,6 @@ convert \
 -n \
 --target-image-opts \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
---object secret,id=OtherDemo.img_encrypt0,\
-file=/path/to/inputSecretFile driver=luks,\
-file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 driver=luks,\
-file.filename=/var/lib/libvirt/images/LuksDemo.img,\
-key-secret=LuksDemo.img_encrypt0
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,key-secret=OtherDemo.img_encrypt0 \
+driver=luks,file.filename=/var/lib/libvirt/images/LuksDemo.img,key-secret=LuksDemo.img_encrypt0

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
index 1320e2ee2fa6c6a874eb194d1fd090cb68683eeb..4b9ccfe8dc0338da49ddc88e6e443e60c4143214 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
@@ -1,14 +1,14 @@
 qemu-img \
 create \
 -f qcow2 \
--o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K
+-o compat=0.10 \
+/var/lib/libvirt/images/sparse-qcow2.img \
+1073741824K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,\
-file=/path/to/inputSecretFile driver=luks,\
-file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 driver=qcow2,\
-file.filename=/var/lib/libvirt/images/sparse-qcow2.img
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,key-secret=OtherDemo.img_encrypt0 \
+driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
index e14085021724d025e8c83ab8a6be1b902f884995..d48dbf371cb6c9d73f25d47389538a41753da190 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
@@ -1,13 +1,13 @@
 qemu-img \
 create \
--f raw /var/lib/libvirt/images/sparse.img 1073741824K
+-f raw \
+/var/lib/libvirt/images/sparse.img \
+1073741824K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,\
-file=/path/to/inputSecretFile driver=luks,\
-file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 driver=raw,\
-file.filename=/var/lib/libvirt/images/sparse.img
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,key-secret=OtherDemo.img_encrypt0 \
+driver=raw,file.filename=/var/lib/libvirt/images/sparse.img

diff --git a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
index 78cd9a2a8dd493278b70a15e5db9ea7ea4dd772d..050d6fce0dbd70f6ce62cf1031aa689a7ca6a7b8 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
+++ b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
@@ -2,15 +2,14 @@ qemu-img \
 create \
 -f luks \
 --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \
+-o key-secret=OtherDemo.img_encrypt0 \
+/var/lib/libvirt/images/OtherDemo.img \
 5242880K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,\
-file=/path/to/secretFile driver=qcow2,\
-file.filename=/var/lib/libvirt/images/sparse-qcow2.img driver=luks,\
-file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
+driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img \
+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,key-secret=OtherDemo.img_encrypt0

diff --git a/tests/storagevolxml2argvdata/luks-convert.argv b/tests/storagevolxml2argvdata/luks-convert.argv
index e4a8277d7f5312cef1d830a794e4799e4cc226ca..5b6bc7bc636d8748da564be130e1aa69aeb5a8b3 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert.argv
+++ b/tests/storagevolxml2argvdata/luks-convert.argv
@@ -2,14 +2,14 @@ qemu-img \
 create \
 -f luks \
 --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \
+-o key-secret=OtherDemo.img_encrypt0 \
+/var/lib/libvirt/images/OtherDemo.img \
 5242880K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile driver=raw,\
-file.filename=/var/lib/libvirt/images/sparse.img driver=luks,\
-file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
+driver=raw,file.filename=/var/lib/libvirt/images/sparse.img \
+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,key-secret=OtherDemo.img_encrypt0

diff --git a/tests/storagevolxml2argvdata/luks.argv b/tests/storagevolxml2argvdata/luks.argv
index 5013c8ca7f0ba453ba426e6701a3b62603e09c95..41b5fd663c32b21dd02b43009ce743995a2021b0 100644 (file)
--- a/tests/storagevolxml2argvdata/luks.argv
+++ b/tests/storagevolxml2argvdata/luks.argv
@@ -2,5 +2,6 @@ qemu-img \
 create \
 -f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \
+-o key-secret=LuksDemo.img_encrypt0 \
+/var/lib/libvirt/images/LuksDemo.img \
 5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevolxml2argvdata/qcow2-1.1.argv
index 5ee974afe95aaa0f75c513d684dcbfc1d62c64c4..40fbe065e05e2fd725fef773f35a9102cc7b7c5c 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-1.1.argv
+++ b/tests/storagevolxml2argvdata/qcow2-1.1.argv
@@ -2,4 +2,6 @@ qemu-img \
 create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K
+-o backing_fmt=raw,compat=1.1 \
+/var/lib/libvirt/images/OtherDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv
index 3071d7a79009035021dc5ab495dc343c9376e86e..bf3a50a7f3258e3d5e17abe1ba2cf005032e8d87 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-compat.argv
@@ -2,4 +2,6 @@ qemu-img \
 create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K
+-o backing_fmt=raw,compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
index 1971da200d09e1269627cb7974dc385c845d32b4..dbc7deb16a70636590c77de9dbf6f436f11c7fb7 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
@@ -2,4 +2,6 @@ qemu-img \
 convert \
 -f raw \
 -O qcow2 \
--o compat=0.10 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img
+-o compat=0.10 \
+/dev/HostVG/Swap \
+/var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-lazy.argv b/tests/storagevolxml2argvdata/qcow2-lazy.argv
index 2621b011684547e583bc09de6cf5c27b485d0570..cd551be6e92bb9b1fbd3915e4d5c9344936ae629 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-lazy.argv
+++ b/tests/storagevolxml2argvdata/qcow2-lazy.argv
@@ -2,5 +2,6 @@ qemu-img \
 create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,compat=1.1,\
-lazy_refcounts /var/lib/libvirt/images/OtherDemo.img 5242880K
+-o backing_fmt=raw,compat=1.1,lazy_refcounts \
+/var/lib/libvirt/images/OtherDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv
index de8aef4233308743cbefd2ad75e99004a243b8f0..d89622d4a66faca007a1360d59874e9c2b68a5b4 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv
+++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv
@@ -2,17 +2,15 @@ qemu-img \
 create \
 -f qcow2 \
 --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \
--o encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,\
-compat=0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K
+-o encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=0.10 \
+/var/lib/libvirt/images/OtherDemoLuks.img \
+5242880K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
 --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \
---object secret,id=OtherDemoLuksConvert.img_encrypt0,\
-file=/path/to/inputSecretFile driver=qcow2,\
-file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,\
-encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 driver=qcow2,\
-file.filename=/var/lib/libvirt/images/OtherDemoLuks.img,\
-encrypt.key-secret=OtherDemoLuks.img_encrypt0
+--object secret,id=OtherDemoLuksConvert.img_encrypt0,file=/path/to/inputSecretFile \
+driver=qcow2,file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 \
+driver=qcow2,file.filename=/var/lib/libvirt/images/OtherDemoLuks.img,encrypt.key-secret=OtherDemoLuks.img_encrypt0

diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv
index 517156ca832a4b22e85a769f8446f6fcb8a006e3..4d910552d017950ad66a7b9d9a790653da7e456d 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv
+++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv
@@ -1,14 +1,14 @@
 qemu-img \
 create \
 -f qcow2 \
--o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K
+-o compat=0.10 \
+/var/lib/libvirt/images/sparse-qcow2.img \
+1073741824K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemoLuksConvert.img_encrypt0,\
-file=/path/to/inputSecretFile driver=qcow2,\
-file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,\
-encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 driver=qcow2,\
-file.filename=/var/lib/libvirt/images/sparse-qcow2.img
+--object secret,id=OtherDemoLuksConvert.img_encrypt0,file=/path/to/inputSecretFile \
+driver=qcow2,file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 \
+driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img

diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv
index 7483c864c1469d6fd67c0d7ea55867ed1d386f84..24197bfd645f6b6d8880d0dbc6d62fe24a6021ca 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv
+++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv
@@ -1,13 +1,13 @@
 qemu-img \
 create \
--f raw /var/lib/libvirt/images/sparse.img 1073741824K
+-f raw \
+/var/lib/libvirt/images/sparse.img \
+1073741824K
 qemu-img \
 convert \
 --image-opts \
 -n \
 --target-image-opts \
---object secret,id=OtherDemoLuksConvert.img_encrypt0,\
-file=/path/to/inputSecretFile driver=qcow2,\
-file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,\
-encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 driver=raw,\
-file.filename=/var/lib/libvirt/images/sparse.img
+--object secret,id=OtherDemoLuksConvert.img_encrypt0,file=/path/to/inputSecretFile \
+driver=qcow2,file.filename=/var/lib/libvirt/images/OtherDemoLuksConvert.img,encrypt.key-secret=OtherDemoLuksConvert.img_encrypt0 \
+driver=raw,file.filename=/var/lib/libvirt/images/sparse.img

diff --git a/tests/storagevolxml2argvdata/qcow2-luks.argv b/tests/storagevolxml2argvdata/qcow2-luks.argv
index 4b51b374ca8ff0d2ad5476ce983d5d32b6ea487d..308316c90c8b1cecaa9ae7eda02b522629657561 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-luks.argv
+++ b/tests/storagevolxml2argvdata/qcow2-luks.argv
@@ -3,6 +3,6 @@ create \
 -f qcow2 \
 -b /dev/null \
 --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \
--o backing_fmt=raw,encrypt.format=luks,\
-encrypt.key-secret=OtherDemoLuks.img_encrypt0,\
-compat=0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K
+-o backing_fmt=raw,encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=0.10 \
+/var/lib/libvirt/images/OtherDemoLuks.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
index 87489641d538675dd643076a1f75b9dcd3b56c91..463ae267791445d910c1724c6abde99887963bc9 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
@@ -2,6 +2,6 @@ qemu-img \
 convert \
 -f raw \
 -O qcow2 \
--o preallocation=metadata,\
-compat=0.10 /var/lib/libvirt/images/sparse.img \
+-o preallocation=metadata,compat=0.10 \
+/var/lib/libvirt/images/sparse.img \
 /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
index a883030744b29c1c39fb2f229e5d50ecaa16f782..510e0c13f658e71c4e079298b08e7e70f17677b7 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
@@ -1,5 +1,6 @@
 qemu-img \
 create \
 -f qcow2 \
--o preallocation=metadata,\
-compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K
+-o preallocation=metadata,compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
index 049d2d73b596df27e6648616fd59e595030546c7..0152b1efb6dabb14648923d851e425947c0cabc4 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
@@ -2,6 +2,6 @@ qemu-img \
 convert \
 -f raw \
 -O qcow2 \
--o preallocation=falloc,\
-compat=0.10 /var/lib/libvirt/images/sparse.img \
+-o preallocation=falloc,compat=0.10 \
+/var/lib/libvirt/images/sparse.img \
 /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
index 30bcfb00c7eac03e9b3e7fa62e63e0865df6e309..047932a559ef4d145897c4381965f244f1354f72 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
@@ -2,4 +2,5 @@ qemu-img \
 create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img
+-o backing_fmt=raw,compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
index 5e327dab0bdc92da626e0620e8e5e6e203977bbb..4cc7904cfcb6bcc6930974a703fcfd59821222d0 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
@@ -2,5 +2,6 @@ qemu-img \
 create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,nocow=on,\
-compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K
+-o backing_fmt=raw,nocow=on,compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img \
+5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv
index 95dfc65d9b80bc073bc8ee41c318a8034fc1efbb..607c642e6f3e92ecc64367dee0d9172f5ccb00f5 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv
+++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv
@@ -1,4 +1,6 @@
 qemu-img \
 create \
 -f qcow2 \
--o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K
+-o compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img \
+0K

diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 5e623134413fe842584e339aa9808c321684e9ab..1b639e157e0223d346c8773c2fd165f7641c0c0f 100644 (file)
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -104,13 +104,13 @@ testCompareXMLToArgvFiles(bool shouldFail,
         }
 
         if (convertStep != VIR_STORAGE_VOL_ENCRYPT_CONVERT) {
-            if (!(actualCmdline = virCommandToString(cmd, false)))
+            if (!(actualCmdline = virCommandToString(cmd, true)))
                 goto cleanup;
         } else {
             char *createCmdline = actualCmdline;
             g_autofree char *cvtCmdline = NULL;
 
-            if (!(cvtCmdline = virCommandToString(cmd, false)))
+            if (!(cvtCmdline = virCommandToString(cmd, true)))
                 goto cleanup;
 
             actualCmdline = g_strdup_printf("%s\n%s", createCmdline, cvtCmdline);
@@ -127,7 +127,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
 
     } while (convertStep != VIR_STORAGE_VOL_ENCRYPT_DONE);
 
-    if (virTestCompareToFile(actualCmdline, cmdline) < 0)
+    if (virTestCompareToFileFull(actualCmdline, cmdline, false) < 0)
         goto cleanup;
 
     ret = 0;