Add new approach to properly test status XML files by supplying a full
XML file rather than generating synthetic test cases by prepending the
status header. The two tests introduced here are copies of existing
cases using the synthetic header so that current level of testing is
kept. The files are chosen to excercise the vcpu and blockjob quirks
present in the current testing.
Signed-off-by: Peter Krempa
---
tests/Makefile.am | 1 +
tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 96 ++
.../qemustatusxml2xmldata/blockjob-mirror-out.xml | 96 ++
tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 +
tests/qemustatusxml2xmldata/vcpus-multi-out.xml| 343 +
tests/qemuxml2xmltest.c| 109 ++-
6 files changed, 981 insertions(+), 7 deletions(-)
create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml
create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml
create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-out.xml
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d794df3e5c..1f60ee0393 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -128,6 +128,7 @@ EXTRA_DIST = \
qemumonitorjsondata \
qemuxml2argvdata \
qemuxml2xmloutdata \
+ qemustatusxml2xmloutdata \
qemumemlockdata \
secretxml2xmlin \
securityselinuxhelperdata \
diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
new file mode 100644
index 00..a22d2173e7
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+QEMUGuest1
+c7a5fdbd-edaf-9455-926a-d65c16db1809
+219136
+219136
+1
+
+ hvm
+
+
+
+destroy
+restart
+destroy
+
+ /usr/bin/qemu-system-i686
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml
b/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml
new file mode 100644
index 00..a22d2173e7
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+QEMUGuest1
+c7a5fdbd-edaf-9455-926a-d65c16db1809
+219136
+219136
+1
+
+ hvm
+
+
+
+destroy
+restart
+destroy
+
+ /usr/bin/qemu-system-i686
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
new file mode 100644
index 00..c99046ce8d
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+