# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1236318048 28800
# Node ID 21a55f9af9b93335a5943de71bc3e0643e1f66be
# Parent c6f7256013b97dc57a31312897e45eb3cd8604a7
[TEST] #2 Fix ElementConforms/04_ectp_rev_errs.py err message
Updates form 1 to 2:
1) Change the revision changeset number to 815 instead of 817
2) Assign the revision value to a variable instead of directly using it for the
comparison
Updates tc err message to meet the provder updates
Tested for KVM/LXC with current sources and rpm
Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com>
diff -r c6f7256013b9 -r 21a55f9af9b9
suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py
--- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Tue Mar 03 08:47:40
2009 -0800
+++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Thu Mar 05 21:40:48
2009 -0800
@@ -89,10 +89,10 @@
from XenKvmLib.test_doms import destroy_and_undefine_all
from CimTest.ReturnCodes import PASS, FAIL
from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
-from XenKvmLib.const import do_main
+from XenKvmLib.const import do_main, get_provider_version
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
-
+libvrit_eleconform_changes = 815
test_dom = "domU"
cs_values = {
@@ -165,7 +165,12 @@
'INVALID_Name_Keyvalue'
]
+ curr_cim_rev, changeset = get_provider_version(options.virt, options.ip)
for i in range(len(tc_scen)):
+ if i == 3 and curr_cim_rev >= libvrit_eleconform_changes:
+ desc = "Referenced domain `INVALID_Name_Keyvalue'" + \
+ " does not exist: Domain not found"
+ cs_values[tc_scen[i]]['desc'] = desc
retval = try_invalid_assoc(hs, host_name_val, i, tc_scen[i], options.virt)
if retval != PASS:
status = retval