[PATCH v2 2/2] genericxml2xmltest: Modify cachetune test to include id
I changed DO_TEST_DIFFERENT to DO_TEST, which allows us to remove
the duplicate out file. I also added id attribute for domain
element in order to parse it as a live XML ('cachetune id' is in
the output of only live XMLs). Lastly I added id of cachetune to
test its output value.
Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com>
---
tests/genericxml2xmlindata/cachetune.xml | 8 +++---
tests/genericxml2xmloutdata/cachetune.xml | 34 -----------------------
tests/genericxml2xmltest.c | 2 +-
3 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml
diff --git a/tests/genericxml2xmlindata/cachetune.xml
b/tests/genericxml2xmlindata/cachetune.xml
index 40259cf2ee..07e81999a5 100644
--- a/tests/genericxml2xmlindata/cachetune.xml
+++ b/tests/genericxml2xmlindata/cachetune.xml
@@ -1,16 +1,16 @@
-<domain type='qemu'>
+<domain type='qemu' id='42'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>4</vcpu>
<cputune>
- <cachetune vcpus='0-1'>
- <monitor level='3' vcpus='0-1'/>
+ <cachetune vcpus='0-1' id='vcpus_0-1'>
<cache id='0' level='3' type='both' size='3'
unit='MiB'/>
<cache id='1' level='3' type='both' size='3'
unit='MiB'/>
+ <monitor level='3' vcpus='0-1'/>
</cachetune>
- <cachetune vcpus='3'>
+ <cachetune vcpus='3' id='vcpus_3'>
<cache id='0' level='3' type='both' size='3'
unit='MiB'/>
</cachetune>
</cputune>
diff --git a/tests/genericxml2xmloutdata/cachetune.xml
b/tests/genericxml2xmloutdata/cachetune.xml
deleted file mode 100644
index f05cab70ff..0000000000
--- a/tests/genericxml2xmloutdata/cachetune.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <cputune>
- <cachetune vcpus='0-1'>
- <cache id='0' level='3' type='both' size='3'
unit='MiB'/>
- <cache id='1' level='3' type='both' size='3'
unit='MiB'/>
- <monitor level='3' vcpus='0-1'/>
- </cachetune>
- <cachetune vcpus='3'>
- <cache id='0' level='3' type='both' size='3'
unit='MiB'/>
- </cachetune>
- </cputune>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <controller type='usb' index='0'/>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index ac89422a32..17448a3465 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -214,7 +214,7 @@ mymain(void)
DO_TEST("cachetune-small");
DO_TEST("cachetune-cdp");
- DO_TEST_DIFFERENT("cachetune");
+ DO_TEST("cachetune");
DO_TEST_DIFFERENT("cachetune-extra-tunes");
DO_TEST_FULL("cachetune-colliding-allocs", false, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
--
2.31.1