tests: Drop existing <title> and <description> tags

Now that we have an explicit test case for the feature in
genericxml2xmltest, we can drop a bunch of duplicated accidental
coverage from qemuxmlconftest.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxmlconfdata/440fx-wrong-root.xml b/tests/qemuxmlconfdata/440fx-wrong-root.xml
index 803f28d5692ddbbea031ba695bf4a1da2873b9ab..9197b21c06523b3cf2826f4b42f9a893fd9f8fc1 100644 (file)
--- a/tests/qemuxmlconfdata/440fx-wrong-root.xml
+++ b/tests/qemuxmlconfdata/440fx-wrong-root.xml
@@ -1,11 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <os>

diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml
index 0d4b23637169945085d801c51542bab2afd73111..dd927e1075b393ea1415dfa1058c4f172a25c60a 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.xml b/tests/qemuxmlconfdata/cpu-host-model-features.xml
index 6a00b34136090aa675566ce64f28ad2e01fb314b..c13ae375d6914693afe1e959f7b6fcaa8ee30abb 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-features.xml
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml
index 35c99b533aea16f9a1d52ed686164e46587555c3..02bddfb145819f159282b90ffe1e6bdc111b9d1c 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough-features.xml b/tests/qemuxmlconfdata/cpu-host-passthrough-features.xml
index d8bd36c1f22bf0bb8a158edf02ade33a804f4c68..e87b5fe2f199039884cddf607fdb9c0d3eae0ca6 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough-features.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml
index ad889ca691f61538fe8d7d3e81bb32b8e10f209e..068a2d6c5461062cd14e55ff861e284b830080a0 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/cpu-tsc-frequency.xml b/tests/qemuxmlconfdata/cpu-tsc-frequency.xml
index afaef6e8e5ffcd44d63a0cc717caa4143588b0a8..2acafe8f13d1d5ee93cd9fb3bc11d60c6fba8573 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-tsc-frequency.xml
+++ b/tests/qemuxmlconfdata/cpu-tsc-frequency.xml
@@ -1,11 +1,6 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml
index 8da45000d2dfce38428479efed48f91633754498..312e73594789e6c1b635f55015689c5a9cb13975 100644 (file)
--- a/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml
@@ -1,7 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <description>This test is meant for testing CDROMS with buses which don&apos;t really support them</description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/disk-cdrom-bus-other.xml b/tests/qemuxmlconfdata/disk-cdrom-bus-other.xml
index 2f3efec61ffe55cc0b0869519c6003c0da18db72..9564dc11bea851fc6a906f3fc8104a2c75dd2d6d 100644 (file)
--- a/tests/qemuxmlconfdata/disk-cdrom-bus-other.xml
+++ b/tests/qemuxmlconfdata/disk-cdrom-bus-other.xml
@@ -1,7 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <description>This test is meant for testing CDROMS with buses which don't really support them</description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/minimal.x86_64-latest.xml
index 5f26f4750870789dd29b054db6156b238572d416..ffa03532bd160b1cdc8a7e3b4e16e7b51bb14ff8 100644 (file)
--- a/tests/qemuxmlconfdata/minimal.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/minimal.x86_64-latest.xml
@@ -1,11 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/minimal.xml b/tests/qemuxmlconfdata/minimal.xml
index 8854059ab1057cff0a4a0c953ef9e81689a4fb71..a77240d87c084ae9a4a881fdd482ee2328d7090c 100644 (file)
--- a/tests/qemuxmlconfdata/minimal.xml
+++ b/tests/qemuxmlconfdata/minimal.xml
@@ -1,11 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
-  <description>
-      A test of qemu&apos;s minimal configuration.
-      This test also tests the description and title elements.
-  </description>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>

diff --git a/tests/qemuxmlconfdata/missing-machine.xml b/tests/qemuxmlconfdata/missing-machine.xml
index d9935d3338941c1c86e94c1a7d6e9fc0d2b800c0..9170667568174a5c799cc7c4457458e6da395eee 100644 (file)
--- a/tests/qemuxmlconfdata/missing-machine.xml
+++ b/tests/qemuxmlconfdata/missing-machine.xml
@@ -1,7 +1,6 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <title>A description of the test machine.</title>
   <memory unit='KiB'>219100</memory>
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' cpuset='1'>1</vcpu>