From 0de1066fb92c1c19ee3055bf94e6731299bac987 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 7 Mar 2017 10:50:59 -0500 Subject: [PATCH] tests: Add storagevol tests for format=iso Demonstrates the bug fix in commit 0e5db762627 --- tests/storagevolxml2argvdata/iso-input.argv | 2 ++ tests/storagevolxml2argvdata/iso.argv | 1 + tests/storagevolxml2argvtest.c | 7 +++++++ tests/storagevolxml2xmlin/vol-file-iso.xml | 10 ++++++++++ tests/storagevolxml2xmlout/vol-file-iso.xml | 11 +++++++++++ tests/storagevolxml2xmltest.c | 1 + 6 files changed, 32 insertions(+) create mode 100644 tests/storagevolxml2argvdata/iso-input.argv create mode 100644 tests/storagevolxml2argvdata/iso.argv create mode 100644 tests/storagevolxml2xmlin/vol-file-iso.xml create mode 100644 tests/storagevolxml2xmlout/vol-file-iso.xml diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv new file mode 100644 index 0000000000..1db0265945 --- /dev/null +++ b/tests/storagevolxml2argvdata/iso-input.argv @@ -0,0 +1,2 @@ +qemu-img convert -f raw -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 new file mode 100644 index 0000000000..172a255eb8 --- /dev/null +++ b/tests/storagevolxml2argvdata/iso.argv @@ -0,0 +1 @@ +qemu-img create -f raw /var/lib/libvirt/images/test.iso 1024K diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index bf9dbe5e08..24c3bac20d 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -272,6 +272,13 @@ mymain(void) "pool-dir", "vol-qcow2-nocapacity-backing", NULL, NULL, "qcow2-nocapacity", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-file-iso", + NULL, NULL, + "iso", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-file", + "pool-dir", "vol-file-iso", + "iso-input", 0, FMT_OPTIONS); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-file-iso.xml b/tests/storagevolxml2xmlin/vol-file-iso.xml new file mode 100644 index 0000000000..b1f075679d --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-file-iso.xml @@ -0,0 +1,10 @@ + + test.iso + + 1 + 1 + + + /var/lib/libvirt/images/test.iso + + diff --git a/tests/storagevolxml2xmlout/vol-file-iso.xml b/tests/storagevolxml2xmlout/vol-file-iso.xml new file mode 100644 index 0000000000..9783124b34 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-file-iso.xml @@ -0,0 +1,11 @@ + + test.iso + + + 1048576 + 1048576 + + /var/lib/libvirt/images/test.iso + + + diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index db82bea5be..18e8016cb3 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -100,6 +100,7 @@ mymain(void) DO_TEST("pool-dir", "vol-file"); DO_TEST("pool-dir", "vol-file-naming"); DO_TEST("pool-dir", "vol-file-backing"); + DO_TEST("pool-dir", "vol-file-iso"); DO_TEST("pool-dir", "vol-qcow2"); DO_TEST("pool-dir", "vol-qcow2-1.1"); DO_TEST("pool-dir", "vol-qcow2-lazy"); -- 2.47.2