External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: delete most qemu-img test cases assuming FMT_OPTIONS

Browse Source 
We have two leftover "capabilites" for qemu-img:
QEMU_IMG_BACKING_FORMAT_OPTIONS
QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT

The former says we are able to specify the backing format via -o
(which has been the case for a long time now) and the second one
says we can use -o compat to specify the qcow2 version.

Since we require QEMU 1.5.0, we can always assume -o compat,
which was introduced in QEMU 1.1.

Drop the test cases using FMT_OPTIONS which have a FMT_COMPAT
counterpart to prepare for deprecating FMT_OPTIONS (and these flags)
completely.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Ján Tomko 2018-04-17 23:25:45 +02:00
parent 40b5c99a5b
commit 3590ebdfd2
6 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv
View File

@ -1,2 +0,0 @@
qemu-img convert -f raw -O qcow2 -o encryption=on \
/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img

2
tests/storagevolxml2argvdata/qcow2-from-logical.argv
View File

@ -1,2 +0,0 @@
qemu-img convert -f raw -O qcow2 -o encryption=on /dev/HostVG/Swap \
/var/lib/libvirt/images/OtherDemo.img

2
tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv
View File

@ -1,2 +0,0 @@
qemu-img convert -f raw -O qcow2 -o encryption=on,preallocation=metadata \
/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img

2
tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv
View File

@ -1,2 +0,0 @@
qemu-img create -f qcow2 -o encryption=on,preallocation=metadata \
/var/lib/libvirt/images/OtherDemo.img 5242880K

2
tests/storagevolxml2argvdata/qcow2.argv
View File

@ -1,2 +0,0 @@
qemu-img create -f qcow2 -b /dev/null -o backing_fmt=raw,encryption=on \
/var/lib/libvirt/images/OtherDemo.img 5242880K

37
tests/storagevolxml2argvtest.c
View File

@ -196,40 +196,6 @@ mymain(void)
#define DO_TEST_FAIL(pool, ...) \
DO_TEST_FULL(true, 0, pool, __VA_ARGS__)
DO_TEST("pool-dir", "vol-qcow2",
NULL, NULL,
"qcow2", 0, FMT_OPTIONS);
DO_TEST_FAIL("pool-dir", "vol-qcow2",
NULL, NULL,
"qcow2-prealloc", flags, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-nobacking",
NULL, NULL,
"qcow2-nobacking-prealloc", flags, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-nobacking",
"pool-dir", "vol-file",
"qcow2-nobacking-convert-prealloc", flags, FMT_OPTIONS);
DO_TEST_FAIL("pool-dir", "vol-qcow2",
"pool-dir", "vol-file",
"qcow2-convert-nobacking", 0, FMT_OPTIONS);
DO_TEST_FAIL("pool-dir", "vol-qcow2",
"pool-dir", "vol-file",
"qcow2-convert-prealloc", flags, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-lazy",
NULL, NULL,
"qcow2-lazy", 0, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-1.1",
NULL, NULL,
"qcow2-1.1", 0, FMT_OPTIONS);
DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy",
NULL, NULL,
"qcow2-0.10-lazy", 0, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-nobacking",
"pool-logical", "vol-logical",
"qcow2-from-logical", 0, FMT_OPTIONS);
DO_TEST("pool-logical", "vol-logical",
"pool-dir", "vol-qcow2-nobacking",
"logical-from-qcow2", 0, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2",
NULL, NULL,
"qcow2-compat", 0, FMT_COMPAT);
@ -254,9 +220,6 @@ mymain(void)
DO_TEST("pool-logical", "vol-logical",
"pool-dir", "vol-qcow2-nobacking",
"logical-from-qcow2", 0, FMT_COMPAT);
DO_TEST("pool-dir", "vol-qcow2-nocow",
NULL, NULL,
"qcow2-nocow", 0, FMT_OPTIONS);
DO_TEST("pool-dir", "vol-qcow2-nocow",
NULL, NULL,
"qcow2-nocow-compat", 0, FMT_COMPAT);