[virt-tools-list] [PATCH] test: Fix tests with latest libvirt

[Chen, Hanxiao]

Hi,

> -----Original Message-----
> From: virt-tools-list-bounces at redhat.com
> [mailto:virt-tools-list-bounces at redhat.com] On Behalf Of Giuseppe Scrivano
> Sent: Monday, September 15, 2014 5:30 PM
> To: virt-tools-list at redhat.com
> Subject: [virt-tools-list] [PATCH] test: Fix tests with latest libvirt
> 


We've already had some ongoing work on this at:
https://www.redhat.com/archives/virt-tools-list/2014-September/msg00083.html


And v2 patch is at:
https://www.redhat.com/archives/virt-tools-list/2014-September/msg00087.html


Thanks, 
- Chen

> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
> FYI, pushed as trivial
> 
>  tests/cli-test-xml/compare/virt-clone-clone-auto1.xml     | 2 +-
>  tests/cli-test-xml/compare/virt-clone-clone-auto2.xml     | 2 +-
>  tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml  | 4 ++--
>  tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
> b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
> index 03b7b5c..3979a25 100644
> --- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
> +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
> @@ -6,7 +6,7 @@
>    <vcpu placement="static">5</vcpu>
>    <os>
>      <type arch="i686">hvm</type>
> -    <loader>/usr/lib/xen/boot/hvmloader</loader>
> +    <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
>      <boot dev="hd"/>
>    </os>
>    <features>
> diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
> b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
> index bbbde76..af8c7aa 100644
> --- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
> +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
> @@ -6,7 +6,7 @@
>    <vcpu placement="static">5</vcpu>
>    <os>
>      <type arch="i686">hvm</type>
> -    <loader>/usr/lib/xen/boot/hvmloader</loader>
> +    <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
>      <boot dev="hd"/>
>    </os>
>    <features>
> diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
> b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
> index 246d58c..f8e0739 100644
> --- a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
> +++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
> @@ -1,8 +1,8 @@
>     </numatune>
>     <os>
>       <type arch="i686">hvm</type>
> --    <loader>/usr/lib/xen/boot/hvmloader</loader>
> -+    <loader>foo.bar</loader>
> +-    <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
> ++    <loader type="rom">foo.bar</loader>
>  +    <bios useserial="yes"/>
>  +    <init>/bin/bash</init>
>     </os>
> diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
> b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
> index 1060179..d2e35bc 100644
> --- a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
> +++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
> @@ -1,4 +1,4 @@
> -     <loader>/usr/lib/xen/boot/hvmloader</loader>
> +     <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
>     </os>
>     <idmap>
>  -    <uid start="0" target="1000" count="10"/>
> --
> 1.9.3
> 
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list