From 153e485bb79c2a586b61a90c01d008d579e74fe3 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 26 Sep 2013 14:47:01 +0200 Subject: [PATCH] Fix some tests Signed-off-by: Giuseppe Scrivano --- tests/image-xml/image2guest/image-format-out.xml | 6 +++--- tests/image-xml/image2guest/image-xenfv32.xml | 6 +++--- tests/image-xml/image2guest/image-xenpv32-kernel.xml | 6 +++--- tests/image-xml/image2guest/image-xenpv32.xml | 6 +++--- tests/xmlconfig-xml/boot-windowsxp-kvm.xml | 4 ++-- tests/xmlconfig-xml/install-windowsxp-kvm.xml | 4 ++-- tests/xmlparse-xml/add-devices-in.xml | 2 +- tests/xmlparse-xml/change-boot-kernel-in.xml | 2 +- tests/xmlparse-xml/change-boot-kernel-out.xml | 2 +- tests/xmlparse-xml/change-disk-in.xml | 10 +++++----- tests/xmlparse-xml/change-disk-out.xml | 10 +++++----- tests/xmlparse-xml/change-filesystems-in.xml | 2 +- tests/xmlparse-xml/change-filesystems-out.xml | 2 +- tests/xmlparse-xml/change-graphics-in.xml | 2 +- tests/xmlparse-xml/change-graphics-out.xml | 2 +- tests/xmlparse-xml/change-guest-in.xml | 2 +- tests/xmlparse-xml/change-guest-out.xml | 2 +- tests/xmlparse-xml/change-rng-egd-in.xml | 2 +- tests/xmlparse-xml/change-rng-egd-out.xml | 2 +- tests/xmlparse-xml/change-rng-random-in.xml | 2 +- tests/xmlparse-xml/change-rng-random-out.xml | 2 +- tests/xmlparse-xml/change-smartcard-in.xml | 2 +- tests/xmlparse-xml/change-smartcard-out.xml | 2 +- tests/xmlparse-xml/change-sounds-in.xml | 2 +- tests/xmlparse-xml/change-sounds-out.xml | 2 +- tests/xmlparse-xml/change-tpm-in.xml | 2 +- tests/xmlparse-xml/change-tpm-out.xml | 2 +- tests/xmlparse-xml/change-videos-in.xml | 2 +- tests/xmlparse-xml/change-videos-out.xml | 2 +- tests/xmlparse-xml/change-watchdogs-in.xml | 2 +- tests/xmlparse-xml/change-watchdogs-out.xml | 2 +- tests/xmlparse.py | 4 ++-- 32 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/image-xml/image2guest/image-format-out.xml b/tests/image-xml/image2guest/image-format-out.xml index b84a04f33..da0d873f8 100644 --- a/tests/image-xml/image2guest/image-format-out.xml +++ b/tests/image-xml/image2guest/image-format-out.xml @@ -20,17 +20,17 @@ /usr/lib/xen/bin/qemu-dm - + - + - + diff --git a/tests/image-xml/image2guest/image-xenfv32.xml b/tests/image-xml/image2guest/image-xenfv32.xml index 0a0b02685..24704ca84 100644 --- a/tests/image-xml/image2guest/image-xenfv32.xml +++ b/tests/image-xml/image2guest/image-xenfv32.xml @@ -20,15 +20,15 @@ /usr/lib/xen/bin/qemu-dm - + - + - + diff --git a/tests/image-xml/image2guest/image-xenpv32-kernel.xml b/tests/image-xml/image2guest/image-xenpv32-kernel.xml index 191614fa5..e7e5bfe28 100644 --- a/tests/image-xml/image2guest/image-xenpv32-kernel.xml +++ b/tests/image-xml/image2guest/image-xenpv32-kernel.xml @@ -18,15 +18,15 @@ restart - + - + - + diff --git a/tests/image-xml/image2guest/image-xenpv32.xml b/tests/image-xml/image2guest/image-xenpv32.xml index 854e8cb00..e1fc67f45 100644 --- a/tests/image-xml/image2guest/image-xenpv32.xml +++ b/tests/image-xml/image2guest/image-xenpv32.xml @@ -13,15 +13,15 @@ restart - + - + - + diff --git a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml index 91cc3d080..2973adfd3 100644 --- a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml +++ b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml @@ -24,12 +24,12 @@ - + - + diff --git a/tests/xmlconfig-xml/install-windowsxp-kvm.xml b/tests/xmlconfig-xml/install-windowsxp-kvm.xml index 21c75feac..7d54eab39 100644 --- a/tests/xmlconfig-xml/install-windowsxp-kvm.xml +++ b/tests/xmlconfig-xml/install-windowsxp-kvm.xml @@ -25,12 +25,12 @@ - + - + diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml index 9e225f05d..b84c3bd87 100644 --- a/tests/xmlparse-xml/add-devices-in.xml +++ b/tests/xmlparse-xml/add-devices-in.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/xmlparse-xml/change-boot-kernel-in.xml b/tests/xmlparse-xml/change-boot-kernel-in.xml index 7abd3b506..ffbc280ee 100644 --- a/tests/xmlparse-xml/change-boot-kernel-in.xml +++ b/tests/xmlparse-xml/change-boot-kernel-in.xml @@ -15,7 +15,7 @@ 5 - + diff --git a/tests/xmlparse-xml/change-boot-kernel-out.xml b/tests/xmlparse-xml/change-boot-kernel-out.xml index 7e8d1376f..b66c708df 100644 --- a/tests/xmlparse-xml/change-boot-kernel-out.xml +++ b/tests/xmlparse-xml/change-boot-kernel-out.xml @@ -15,7 +15,7 @@ 5 - + diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/xmlparse-xml/change-disk-in.xml index 720f7309a..d70d67710 100644 --- a/tests/xmlparse-xml/change-disk-in.xml +++ b/tests/xmlparse-xml/change-disk-in.xml @@ -24,19 +24,19 @@ WD-WMAP9A966149 - + - + - + @@ -54,12 +54,12 @@ - + - + diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml index 4c2188dfe..c73cd641f 100644 --- a/tests/xmlparse-xml/change-disk-out.xml +++ b/tests/xmlparse-xml/change-disk-out.xml @@ -19,13 +19,13 @@ /usr/lib/xen/bin/qemu-dm - + frob - + @@ -33,7 +33,7 @@ - + @@ -56,12 +56,12 @@ - + - + diff --git a/tests/xmlparse-xml/change-filesystems-in.xml b/tests/xmlparse-xml/change-filesystems-in.xml index f0d5a1abc..bd1b5cae2 100644 --- a/tests/xmlparse-xml/change-filesystems-in.xml +++ b/tests/xmlparse-xml/change-filesystems-in.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-filesystems-out.xml b/tests/xmlparse-xml/change-filesystems-out.xml index 6d0c00c7f..23297927f 100644 --- a/tests/xmlparse-xml/change-filesystems-out.xml +++ b/tests/xmlparse-xml/change-filesystems-out.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/xmlparse-xml/change-graphics-in.xml index 1dc9e2e8f..55ba01702 100644 --- a/tests/xmlparse-xml/change-graphics-in.xml +++ b/tests/xmlparse-xml/change-graphics-in.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/xmlparse-xml/change-graphics-out.xml index 9ce3cb00d..6d463b3ea 100644 --- a/tests/xmlparse-xml/change-graphics-out.xml +++ b/tests/xmlparse-xml/change-graphics-out.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml index 298e5056d..bbba7a47d 100644 --- a/tests/xmlparse-xml/change-guest-in.xml +++ b/tests/xmlparse-xml/change-guest-in.xml @@ -41,7 +41,7 @@ - + diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml index 71e54247b..51c373373 100644 --- a/tests/xmlparse-xml/change-guest-out.xml +++ b/tests/xmlparse-xml/change-guest-out.xml @@ -44,7 +44,7 @@ - + diff --git a/tests/xmlparse-xml/change-rng-egd-in.xml b/tests/xmlparse-xml/change-rng-egd-in.xml index 74db22645..8f39585e6 100644 --- a/tests/xmlparse-xml/change-rng-egd-in.xml +++ b/tests/xmlparse-xml/change-rng-egd-in.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-rng-egd-out.xml b/tests/xmlparse-xml/change-rng-egd-out.xml index c4bd71ee3..2121c439f 100644 --- a/tests/xmlparse-xml/change-rng-egd-out.xml +++ b/tests/xmlparse-xml/change-rng-egd-out.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-rng-random-in.xml b/tests/xmlparse-xml/change-rng-random-in.xml index fb9367d26..1beddc1d8 100644 --- a/tests/xmlparse-xml/change-rng-random-in.xml +++ b/tests/xmlparse-xml/change-rng-random-in.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-rng-random-out.xml b/tests/xmlparse-xml/change-rng-random-out.xml index 8c3eba403..1f4f04ad3 100644 --- a/tests/xmlparse-xml/change-rng-random-out.xml +++ b/tests/xmlparse-xml/change-rng-random-out.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml index 5033e8e00..c07010c62 100644 --- a/tests/xmlparse-xml/change-smartcard-in.xml +++ b/tests/xmlparse-xml/change-smartcard-in.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml index 72305af30..d733f5541 100644 --- a/tests/xmlparse-xml/change-smartcard-out.xml +++ b/tests/xmlparse-xml/change-smartcard-out.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-sounds-in.xml b/tests/xmlparse-xml/change-sounds-in.xml index 001c50be5..dc5365d66 100644 --- a/tests/xmlparse-xml/change-sounds-in.xml +++ b/tests/xmlparse-xml/change-sounds-in.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-sounds-out.xml b/tests/xmlparse-xml/change-sounds-out.xml index 9d7dd4bd3..dfd9dddd9 100644 --- a/tests/xmlparse-xml/change-sounds-out.xml +++ b/tests/xmlparse-xml/change-sounds-out.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/xmlparse-xml/change-tpm-in.xml index 271dc9559..78dd1003c 100644 --- a/tests/xmlparse-xml/change-tpm-in.xml +++ b/tests/xmlparse-xml/change-tpm-in.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/xmlparse-xml/change-tpm-out.xml index a606d480e..a5f06827a 100644 --- a/tests/xmlparse-xml/change-tpm-out.xml +++ b/tests/xmlparse-xml/change-tpm-out.xml @@ -36,7 +36,7 @@ - + diff --git a/tests/xmlparse-xml/change-videos-in.xml b/tests/xmlparse-xml/change-videos-in.xml index 76f8806e1..7dde76802 100644 --- a/tests/xmlparse-xml/change-videos-in.xml +++ b/tests/xmlparse-xml/change-videos-in.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - +