On 01/29/2016 05:16 AM, Michal Privoznik wrote:
> In libvirt commit 36785c7e775f3 the input devices are no longer
> added by default in XML parsing phase rather than on domain
> startup. However, we are not starting a domain just merely
> playing around with its definition. Therefore we should adjust
> expected outputs.
>
> Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
> ---
>
> So the libvirt commit I'm referring to is not yet part of any release. Having
> said that, is this the right way to fix the problem?
>
Hmm, kindof. I try to keep the test suite working (not failing) on latest
fedora packages. with this change the tests would work on libvirt.git/1.3.2+
but fail for everything else.
Normally in these cases I'll add a bit to the affected test cases that says
'skip this test unless libvirt >= $VERSION'. grep for compare_check in
tests/clitest.py .
I tried coming up with a way to alter testdriver.xml so it would work in both
cases, but indeed the libvirt <input> XML output was sufficiently weird before
that latest commit that there isn't any way to make it work.
So I've applied your patch, and added this additional commit, see attached.
Thanks,
Cole
>From 2c0157ca9e6a5f8dfb271e2ef4a9731213b00a6a Mon Sep 17 00:00:00 2001
Message-Id: <2c0157ca9e6a5f8dfb271e2ef4a9731213b00a6a.1454099581.git.crobinso@xxxxxxxxxx>
From: Cole Robinson <crobinso@xxxxxxxxxx>
Date: Fri, 29 Jan 2016 15:32:31 -0500
Subject: [PATCH virt-manager] clitest: Skip updated tests on older libvirt
---
tests/clitest.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/clitest.py b/tests/clitest.py
index fb160ad..cab6232 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -829,11 +829,11 @@ c.add_compare("--pm suspend_to_mem=yes,suspend_to_disk=no", "edit-simple-pm")
c.add_compare("--disk /dev/zero,perms=ro,startup_policy=optional", "edit-simple-disk")
c.add_compare("--disk path=", "edit-simple-disk-remove-path")
c.add_compare("--network source=br0,type=bridge,model=virtio,mac=", "edit-simple-network")
-c.add_compare("--graphics tlsport=5902,keymap=ja", "edit-simple-graphics")
+c.add_compare("--graphics tlsport=5902,keymap=ja", "edit-simple-graphics", compare_check="1.3.2") # compare_check=<input> reordering
c.add_compare("--controller index=15,model=lsilogic", "edit-simple-controller")
c.add_compare("--smartcard type=spicevmc", "edit-simple-smartcard")
c.add_compare("--redirdev type=spicevmc,server=example.com:12345", "edit-simple-redirdev")
-c.add_compare("--tpm path=/dev/tpm", "edit-simple-tpm")
+c.add_compare("--tpm path=/dev/tpm", "edit-simple-tpm", compare_check="1.3.2") # compare_check=<input> reordering
c.add_compare("--rng rate_bytes=3333,rate_period=4444", "edit-simple-rng")
c.add_compare("--watchdog action=reset", "edit-simple-watchdog")
c.add_compare("--memballoon model=none", "edit-simple-memballoon")
@@ -843,7 +843,7 @@ c.add_compare("--channel null", "edit-simple-channel")
c.add_compare("--console name=foo.bar.baz", "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")
+c.add_compare("--sound pcspk", "edit-simple-soundhw", compare_check="1.3.2") # compare_check=<input> reordering
c.add_compare("--host-device 0x0781:0x5151,driver_name=vfio", "edit-simple-host-device")
c = vixml.add_category("edit selection", "test-for-virtxml --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
--
2.5.0
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
