[PATCH] [TEST] #2 Fix ElementConforms/04_ectp_rev_errs.py err message
# HG changeset patch # User Guolian Yun <yunguol@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@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
yunguol@cn.ibm.com wrote:
# HG changeset patch # User Guolian Yun <yunguol@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@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:
Instead of checking the index can you check the tc_scen being executed to make a decision. Like that if in future the tc_scen[] changes we dont have to make these changes. There are lot of places which do not adhere to the 80 column can you please modify them as well. Also, kindly remove the \ which are not needed in the tc. import statements for utils, destroy_and_undefine_all not used please remove them as well. Do we really require to use full_hostname() function anymore ?
+ 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
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
libvirt-cim-bounces@redhat.com wrote on 2009-03-06 14:49:18:
# HG changeset patch # User Guolian Yun <yunguol@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@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.
+++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.
@@ -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,
yunguol@cn.ibm.com wrote: py Tue Mar 03 08:47:40 2009 -0800 py Thu Mar 05 21:40:48 2009 -0800 options.ip)
for i in range(len(tc_scen)): + if i == 3 and curr_cim_rev >= libvrit_eleconform_changes:
Instead of checking the index can you check the tc_scen being executed to make a decision. Like that if in future the tc_scen[] changes we dont have to make these changes. There are lot of places which do not adhere to the 80 column can you please modify them as well. Also, kindly remove the \ which are not needed in the tc. import statements for utils, destroy_and_undefine_all not used please remove them as well. Do we really require to use full_hostname() function anymore ?
The association query doesn't work for me with part of hostname. Otherwise look fine to me. I will send a new patch. Thanks!
+ 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
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
participants (3)
-
Deepti B Kalakeri -
Guo Lian Yun -
yunguol＠cn.ibm.com