openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: assume FMT_COMPAT for qemu-img tests 

No point in testing outdated command lines.

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:32:23 +02:00
parent 3590ebdfd2
commit 74abb43aca
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
qemu-img convert -f raw -O qcow2 \ qemu-img convert -f raw -O qcow2 \
-o encryption=on,preallocation=falloc \ -o encryption=on,preallocation=falloc,compat=0.10 \
/var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/sparse.img \
/var/lib/libvirt/images/OtherDemo.img /var/lib/libvirt/images/OtherDemo.img

2
tests/storagevolxml2argvdata/qcow2-nocapacity.argv
View File

@ -1,5 +1,5 @@
qemu-img create \ qemu-img create \
-f qcow2 \ -f qcow2 \
-b /dev/null \ -b /dev/null \
-o backing_fmt=raw,encryption=on \ -o backing_fmt=raw,encryption=on,compat=0.10 \
/var/lib/libvirt/images/OtherDemo.img /var/lib/libvirt/images/OtherDemo.img

32
tests/storagevolxml2argvtest.c
View File

@ -180,10 +180,10 @@ mymain(void)
unsigned int flags = VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; unsigned int flags = VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA;
#define DO_TEST_FULL(shouldFail, parseflags, pool, vol, inputpool, inputvol, \ #define DO_TEST_FULL(shouldFail, parseflags, pool, vol, inputpool, inputvol, \
cmdline, flags, imgformat) \ cmdline, flags) \
do { \ do { \
struct testInfo info = { shouldFail, pool, vol, inputpool, inputvol, \ struct testInfo info = { shouldFail, pool, vol, inputpool, inputvol, \
cmdline, flags, imgformat, parseflags }; \ cmdline, flags, FMT_COMPAT, parseflags }; \
if (virTestRun("Storage Vol XML-2-argv " cmdline, \ if (virTestRun("Storage Vol XML-2-argv " cmdline, \
testCompareXMLToArgvHelper, &info) < 0) \ testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \ ret = -1; \
@ -198,47 +198,47 @@ mymain(void)
DO_TEST("pool-dir", "vol-qcow2", DO_TEST("pool-dir", "vol-qcow2",
NULL, NULL, NULL, NULL,
"qcow2-compat", 0, FMT_COMPAT); "qcow2-compat", 0);
DO_TEST("pool-dir", "vol-qcow2-nobacking", DO_TEST("pool-dir", "vol-qcow2-nobacking",
NULL, NULL, NULL, NULL,
"qcow2-nobacking-prealloc-compat", flags, FMT_COMPAT); "qcow2-nobacking-prealloc-compat", flags);
DO_TEST("pool-dir", "vol-qcow2-nobacking", DO_TEST("pool-dir", "vol-qcow2-nobacking",
"pool-dir", "vol-file", "pool-dir", "vol-file",
"qcow2-nobacking-convert-prealloc-compat", flags, FMT_COMPAT); "qcow2-nobacking-convert-prealloc-compat", flags);
DO_TEST("pool-dir", "vol-qcow2-lazy", DO_TEST("pool-dir", "vol-qcow2-lazy",
NULL, NULL, NULL, NULL,
"qcow2-lazy", 0, FMT_COMPAT); "qcow2-lazy", 0);
DO_TEST("pool-dir", "vol-qcow2-1.1", DO_TEST("pool-dir", "vol-qcow2-1.1",
NULL, NULL, NULL, NULL,
"qcow2-1.1", 0, FMT_COMPAT); "qcow2-1.1", 0);
DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy", DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy",
NULL, NULL, NULL, NULL,
"qcow2-0.10-lazy", 0, FMT_COMPAT); "qcow2-0.10-lazy", 0);
DO_TEST("pool-dir", "vol-qcow2-nobacking", DO_TEST("pool-dir", "vol-qcow2-nobacking",
"pool-logical", "vol-logical", "pool-logical", "vol-logical",
"qcow2-from-logical-compat", 0, FMT_COMPAT); "qcow2-from-logical-compat", 0);
DO_TEST("pool-logical", "vol-logical", DO_TEST("pool-logical", "vol-logical",
"pool-dir", "vol-qcow2-nobacking", "pool-dir", "vol-qcow2-nobacking",
"logical-from-qcow2", 0, FMT_COMPAT); "logical-from-qcow2", 0);
DO_TEST("pool-dir", "vol-qcow2-nocow", DO_TEST("pool-dir", "vol-qcow2-nocow",
NULL, NULL, NULL, NULL,
"qcow2-nocow-compat", 0, FMT_COMPAT); "qcow2-nocow-compat", 0);
DO_TEST("pool-dir", "vol-qcow2-nocapacity", DO_TEST("pool-dir", "vol-qcow2-nocapacity",
"pool-dir", "vol-file", "pool-dir", "vol-file",
"qcow2-nocapacity-convert-prealloc", flags, FMT_OPTIONS); "qcow2-nocapacity-convert-prealloc", flags);
DO_TEST("pool-dir", "vol-qcow2-zerocapacity", DO_TEST("pool-dir", "vol-qcow2-zerocapacity",
NULL, NULL, NULL, NULL,
"qcow2-zerocapacity", 0, FMT_COMPAT); "qcow2-zerocapacity", 0);
DO_TEST_FULL(false, VIR_VOL_XML_PARSE_OPT_CAPACITY, DO_TEST_FULL(false, VIR_VOL_XML_PARSE_OPT_CAPACITY,
"pool-dir", "vol-qcow2-nocapacity-backing", NULL, NULL, "pool-dir", "vol-qcow2-nocapacity-backing", NULL, NULL,
"qcow2-nocapacity", 0, FMT_OPTIONS); "qcow2-nocapacity", 0);
DO_TEST("pool-dir", "vol-file-iso", DO_TEST("pool-dir", "vol-file-iso",
NULL, NULL, NULL, NULL,
"iso", 0, FMT_OPTIONS); "iso", 0);
DO_TEST("pool-dir", "vol-file", DO_TEST("pool-dir", "vol-file",
"pool-dir", "vol-file-iso", "pool-dir", "vol-file-iso",
"iso-input", 0, FMT_OPTIONS); "iso-input", 0);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }