# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1209518087 25200 # Node ID 4262862cb05d918bc8516e4528918a0b65f5232a # Parent b3969776fb077e2575effe7cd3c914778d86b63c [TEST] modified the changeset number and add branch of err exp in RAFP.03 Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r b3969776fb07 -r 4262862cb05d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Apr 29 18:14:47 2008 -0700 @@ -28,12 +28,10 @@ from CimTest import Globals from CimTest import Globals from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'XenFV', 'KVM'] - -exp_rc = 6 #CIM_ERR_NOT_FOUND -exp_desc = "No such instance (wrong) - resource pool type mismatch" - +rev = 417 @do_main(sup_types) def main(): @@ -47,6 +45,13 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) + + exp_rc = 6 #CIM_ERR_NOT_FOUND + exp_desc = "No such instance (wrong) - resource pool type mismatch" + if CIM_REV < rev: + exp_rc = 1 # CIM_ERR_FAILED + exp_desc = "Invalid InstanceID or unsupported pool type" + for k, v in poollist.items(): instanceref = CIMInstanceName(k, keybindings = {"InstanceID" : v})