# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1217853560 25200 # Node ID afd9b3b300da23a72118942133d7791c0987573a # Parent 6773c2717b6d2a1ccc3143a27bc2209dabc81e4b [TEST] Fixing the missing status value for 23_suspend_suspend.py, 32_start_reboot.py, 33_suspend_reboot.py, 35_start_reset.py. 1) This is a followup patch for the patchset "Changes to common_util.py library and test cases affected changes." 2) Fixing the missing status value which was missed in the previous patch. Tested on KVM with current sources ONLY. PS: APPLY "Changes to common_util.py library and test cases affected changes." PATCH BEFORE THIS PATCHSET. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 6773c2717b6d -r afd9b3b300da suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Aug 04 05:08:10 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Aug 04 05:39:20 2008 -0700 @@ -94,12 +94,10 @@ break status, dom_cs = poll_for_state_change(server, virt, default_dom, en_state, - timeout=30) - if status != PASS: - break - - if dom_cs.RequestedState != rq_state: - logger.error("RequestedState for dom '%s' is not set as expected.", + timeout=30) + if status != PASS or dom_cs.RequestedState != rq_state: + status = FAIL + logger.error("Attributes for dom '%s' is not set as expected.", default_dom) break diff -r 6773c2717b6d -r afd9b3b300da suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Aug 04 05:08:10 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Aug 04 05:39:20 2008 -0700 @@ -94,11 +94,10 @@ status, dom_cs = poll_for_state_change(server, virt, default_dom, en_state, timeout=10) - if status != PASS: - break - - if dom_cs.RequestedState != rq_state: - logger.error("RequestedState for dom '%s' is not set as expected.", + + if status != PASS or dom_cs.RequestedState != rq_state: + status = FAIL + logger.error("Attributes for dom '%s' is not set as expected.", default_dom) break diff -r 6773c2717b6d -r afd9b3b300da suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Aug 04 05:08:10 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Aug 04 05:39:20 2008 -0700 @@ -101,11 +101,9 @@ status, dom_cs = poll_for_state_change(server, virt, default_dom, en_state, timeout=10) - if status != PASS: - break - - if dom_cs.RequestedState != rq_state: - logger.error("RequestedState for dom '%s' is not set as expected.", + if status != PASS or dom_cs.RequestedState != rq_state: + status = FAIL + logger.error("Attributes for dom '%s' is not set as expected.", default_dom) break diff -r 6773c2717b6d -r afd9b3b300da suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Aug 04 05:08:10 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Aug 04 05:39:20 2008 -0700 @@ -95,11 +95,10 @@ status, dom_cs = poll_for_state_change(server, virt, default_dom, en_state, timeout=30) - if status != PASS: - break - if dom_cs.RequestedState != rq_state: - logger.error("RequestedState for dom '%s' is not set as expected.", + if status != PASS or dom_cs.RequestedState != rq_state: + status = FAIL + logger.error("Attributes for dom '%s' is not set as expected.", default_dom) break