3:49 a.m.
Add file in storagevolxml2xmlin and storagevolxml2xmlout, let
storagevolxml2xmltest and storagevolschematest cover 'nocow'.
Add test case to storagevolxml2argvtest to cover 'nocow'.
Signed-off-by: Chunyan Liu <cyliu(a)suse.com>
---
.../storagevolxml2argvdata/qcow2-nocow-compat.argv | 3 ++
tests/storagevolxml2argvdata/qcow2-nocow.argv | 3 ++
tests/storagevolxml2argvtest.c | 6 ++++
tests/storagevolxml2xmlin/vol-qcow2-nocow.xml | 32 ++++++++++++++++++++++
tests/storagevolxml2xmlout/vol-qcow2-nocow.xml | 31 +++++++++++++++++++++
5 files changed, 75 insertions(+)
create mode 100644 tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
create mode 100644 tests/storagevolxml2argvdata/qcow2-nocow.argv
create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
new file mode 100644
index 0000000..d5a7547
--- /dev/null
+++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
@@ -0,0 +1,3 @@
+qemu-img create -f qcow2 -b /dev/null \
+-o backing_fmt=raw,encryption=on,nocow=on,compat=0.10 \
+/var/lib/libvirt/images/OtherDemo.img 5242880K
diff --git a/tests/storagevolxml2argvdata/qcow2-nocow.argv
b/tests/storagevolxml2argvdata/qcow2-nocow.argv
new file mode 100644
index 0000000..e54801c
--- /dev/null
+++ b/tests/storagevolxml2argvdata/qcow2-nocow.argv
@@ -0,0 +1,3 @@
+qemu-img create -f qcow2 -b /dev/null \
+-o backing_fmt=raw,encryption=on,nocow=on \
+/var/lib/libvirt/images/OtherDemo.img 5242880K
diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 11d70e1..2a45f6f 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -296,6 +296,12 @@ 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);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
b/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
new file mode 100644
index 0000000..661475b
--- /dev/null
+++ b/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
@@ -0,0 +1,32 @@
+<volume>
+ <name>OtherDemo.img</name>
+ <key>/var/lib/libvirt/images/OtherDemo.img</key>
+ <source>
+ </source>
+ <capacity unit="G">5</capacity>
+ <allocation>294912</allocation>
+ <target>
+ <path>/var/lib/libvirt/images/OtherDemo.img</path>
+ <format type='qcow2'/>
+ <permissions>
+ <mode>0644</mode>
+ <owner>0</owner>
+ <group>0</group>
+ <label>unconfined_u:object_r:virt_image_t:s0</label>
+ </permissions>
+ <encryption format='qcow'>
+ <secret type='passphrase'
uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/>
+ </encryption>
+ <nocow/>
+ </target>
+ <backingStore>
+ <path>/dev/null</path>
+ <format type='raw'/>
+ <permissions>
+ <mode>0644</mode>
+ <owner>0</owner>
+ <group>0</group>
+ <label>unconfined_u:object_r:virt_image_t:s0</label>
+ </permissions>
+ </backingStore>
+</volume>
diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
b/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
new file mode 100644
index 0000000..31dc578
--- /dev/null
+++ b/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
@@ -0,0 +1,31 @@
+<volume type='file'>
+ <name>OtherDemo.img</name>
+ <key>/var/lib/libvirt/images/OtherDemo.img</key>
+ <source>
+ </source>
+ <capacity unit='bytes'>5368709120</capacity>
+ <allocation unit='bytes'>294912</allocation>
+ <target>
+ <path>/var/lib/libvirt/images/OtherDemo.img</path>
+ <format type='qcow2'/>
+ <permissions>
+ <mode>0644</mode>
+ <owner>0</owner>
+ <group>0</group>
+ <label>unconfined_u:object_r:virt_image_t:s0</label>
+ </permissions>
+ <encryption format='qcow'>
+ <secret type='passphrase'
uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/>
+ </encryption>
+ </target>
+ <backingStore>
+ <path>/dev/null</path>
+ <format type='raw'/>
+ <permissions>
+ <mode>0644</mode>
+ <owner>0</owner>
+ <group>0</group>
+ <label>unconfined_u:object_r:virt_image_t:s0</label>
+ </permissions>
+ </backingStore>
+</volume>
--
1.8.4.5