[virt-tools-list] [virt-manager PATCH v2 1/2] clitest: upated virt-xml test --console target_type from serial to sclp

[Cole Robinson]

On 06/07/2015 10:55 PM, Chen Hanxiao wrote:
> libvirt commit:
> 8728a78e904de7ddfa32b7761b40d6339fa15030
> Always add 'console' matching the 'serial' device
> 
> If --console target_type=serial, nothing changed.
> We had to update the test case.
> 
> Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>

Thanks, but these patches are still a bit less than ideal, since they change
the test suite to _only_ work with very recent libvirt.git

I pushed a similar change that fixes the test suite to work both before and
after the libvirt.git change.

Thanks,
Cole

> ---
> v2: keep the case and change --console target_type from serial to sclp
> 
>  tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml | 12 +++++++-----
>  tests/clitest.py                                            |  2 +-
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
> index 7bf3a19..4818ed3 100644
> --- a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
> +++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
> @@ -1,11 +1,13 @@
> +       <source path="/tmp/foo.log"/>
>         <target port="0"/>
>       </parallel>
> -     <console type="pty">
> --      <target type="virtio" port="0"/>
> -+      <target type="serial" port="0"/>
> +-    <console type="null">
> +-      <target type="serial" port="0"/>
> ++    <console type="pty">
> ++      <target type="sclp" port="0"/>
>       </console>
> -     <channel type="pipe">
> -       <source path="/tmp/guestfwd"/>
> +     <console type="pty">
> +       <target type="virtio" port="1"/>
>  
>  Domain 'test-for-virtxml' defined successfully.
>  Changes will take effect after the next domain shutdown.
> \ No newline at end of file
> diff --git a/tests/clitest.py b/tests/clitest.py
> index 056ec4a..97e73ab 100644
> --- a/tests/clitest.py
> +++ b/tests/clitest.py
> @@ -816,7 +816,7 @@ c.add_compare("--memballoon model=none", "edit-simple-memballoon")
>  c.add_compare("--serial pty", "edit-simple-serial")
>  c.add_compare("--parallel unix,path=/some/other/log", "edit-simple-parallel")
>  c.add_compare("--channel null", "edit-simple-channel")
> -c.add_compare("--console target_type=serial", "edit-simple-console")
> +c.add_compare("--console char_type=pty,target_type=sclp", "edit-simple-console")
>  c.add_compare("--filesystem /1/2/3,/4/5/6,mode=mapped", "edit-simple-filesystem")
>  c.add_compare("--video cirrus", "edit-simple-video", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
>  c.add_compare("--sound pcspk", "edit-simple-soundhw")
>