[Libvirt-cim] [PATCH] [TEST] Fixing the ComputerSystem tc's

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; # Date 1214830309 25200 # Node ID 197ecb3db922d841a2cdfbcdec5a4bf149dddc83 # Parent 0c3bd5f782c4776719799ad5c74226c95e70092e [TEST] Fixing the ComputerSystem tc's. Updated the tc to report XFAIL since the tc are failing as the requested_state property is not being set appropriately. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Jun 30 05:51:49 2008 -0700 @@ -52,7 +52,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 SUSPND_STATE = 9 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -106,8 +109,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Jun 30 05:51:49 2008 -0700 @@ -51,7 +51,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 REBOOT_STATE = 10 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -60,13 +61,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -105,8 +108,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Jun 30 05:51:49 2008 -0700 @@ -54,7 +54,8 @@ SUSPND_STATE = 9 SUSPND_STATE = 9 REBOOT_STATE = 10 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -63,13 +64,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -109,8 +112,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Jun 30 05:51:49 2008 -0700 @@ -52,7 +52,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 RESET_STATE = 11 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -106,8 +109,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: