[Libvirt-cim] [PATCH] [TEST] #2 Fix DiskRASD and InputRASD verification for LXC
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1234491879 28800
# Node ID f5ef41b6e30f104813132be50f405afdef80cc8a
# Parent 1c9b73e578833fd9fb6d496ebc506e04d52213cf
[TEST] #2 Fix DiskRASD and InputRASD verification for LXC
Updates from 1 to 2:
Remove import lib of "from XenKvmLib.rasd import InstId_err", that is no longer
used in this test case
1) Set test_disk as '/tmp' for LXC
2) Return XFAIL_RC when libvirt allows the user to specify a mouse with "xen"
bus type for LXC
Tested for KVM/LXC with current sources
Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com>
diff -r 1c9b73e57883 -r f5ef41b6e30f
suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Thu Feb
12 01:54:24 2009 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Thu Feb
12 18:24:39 2009 -0800
@@ -51,11 +51,11 @@
from XenKvmLib.test_doms import destroy_and_undefine_all
from XenKvmLib import vxml
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.rasd import InstId_err
from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS
from XenKvmLib.const import do_main
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
+bug_libvirt = "00009"
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
test_dom = "VSSDC_dom"
@@ -66,7 +66,7 @@
def check_rasd_values(id, exp_id):
try:
if id != exp_id:
- InstId_err(assoc_info[i], rasd_list['proc_rasd'])
+ logger.error("Returned %s instead of %s", id, exp_id)
return FAIL
except Exception, detail :
@@ -127,6 +127,8 @@
elif inst.classname == input_cn:
status = check_rasd_values(inst['InstanceID'],
rasd_list['input_rasd'])
+ if status == FAIL and virt == "LXC":
+ return XFAIL_RC(bug_libvirt)
elif inst.classname == grap_cn:
status = check_rasd_values(inst['InstanceID'],
rasd_list['grap_rasd'])
@@ -154,6 +156,8 @@
global test_disk
if options.virt == "Xen":
test_disk = "xvdb"
+ elif options.virt == "LXC":
+ test_disk = "/tmp"
else:
test_disk = "hdb"