[virt-tools-list] [virt-manager PATCH 2/3] test: skip unit tests affected by loader extention before libvirt 1.2.9

Chen Hanxiao chenhanxiao at cn.fujitsu.com
Fri Sep 12 05:23:02 UTC 2014


add compare_check for 'boot' and 'idmap' cases

Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
---
 tests/clitest.py    | 4 ++--
 virtinst/support.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/clitest.py b/tests/clitest.py
index a61b390..93aea43 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -798,8 +798,8 @@ c.add_compare("--vcpus 10,maxvcpus=20,cores=5,sockets=4,threads=1", "edit-simple
 c.add_compare("--cpu model=pentium2,+x2apic,forbid=pbe", "edit-simple-cpu")
 c.add_compare("--numatune 1-5,7,mode=strict", "edit-simple-numatune")
 c.add_compare("--blkiotune weight=500,device_path=/dev/sdf,device_weight=600", "edit-simple-blkiotune")
-c.add_compare("--idmap uid_start=0,uid_target=2000,uid_count=30,gid_start=0,gid_target=3000,gid_count=40", "edit-simple-idmap")
-c.add_compare("--boot loader=foo.bar,useserial=on,init=/bin/bash", "edit-simple-boot")
+c.add_compare("--idmap uid_start=0,uid_target=2000,uid_count=30,gid_start=0,gid_target=3000,gid_count=40", "edit-simple-idmap", compare_check=support.SUPPORT_CONN_LOADER_ROM)
+c.add_compare("--boot loader=foo.bar,useserial=on,init=/bin/bash", "edit-simple-boot", compare_check=support.SUPPORT_CONN_LOADER_ROM)
 c.add_compare("--security label=foo,bar,baz,UNKNOWN=val,relabel=on", "edit-simple-security")
 c.add_compare("--features eoi=on,hyperv_relaxed=off,acpi=", "edit-simple-features")
 c.add_compare("--clock offset=localtime,hpet_present=yes,kvmclock_present=no,rtc_tickpolicy=merge", "edit-simple-clock")
diff --git a/virtinst/support.py b/virtinst/support.py
index 6817c48..b7862a3 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -298,6 +298,7 @@ SUPPORT_CONN_HYPERV_VAPIC = _make(
     version="1.1.0", hv_version={"qemu": "1.1.0", "test": 0})
 SUPPORT_CONN_HYPERV_CLOCK = _make(
     version="1.2.2", hv_version={"qemu": "2.0.0", "test": 0})
+SUPPORT_CONN_LOADER_ROM = _make(version="1.2.9")
 
 
 # Domain checks
-- 
1.9.0




More information about the virt-tools-list mailing list