[PATCH] [TEST] Fixing the 04_defineStartVS.py tc failure
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1207834470 -19800 # Node ID 0e7eb39ed839e03d1dd2635157f19e5acdc4c9be # Parent 1f4926b238908ff7f4c6610fde37490492ba559c [TEST] Fixing the 04_defineStartVS.py tc failure. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 1f4926b23890 -r 0e7eb39ed839 suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Apr 10 18:57:34 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Apr 10 19:04:30 2008 +0530 @@ -6,6 +6,7 @@ # Kaitlin Rupert <karupert@us.ibm.com> # Veerendra Chandrappa <vechandr@in.ibm.com> # Zhengang Li <lizg@cn.ibm.com> +# Deepti B. kalakeri <deeptik@linux.vnet.ibm.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -28,10 +29,11 @@ # 10-Oct-2007 import sys +from time import sleep from XenKvmLib import vxml from XenKvmLib import computersystem -from VirtLib import utils from CimTest import Globals +from XenKvmLib.classes import get_typed_class from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -53,18 +55,21 @@ def main(): Globals.logger.error("Failed to Start the dom: %s", test_dom) cxml.undefine(options.ip) return status - + + timeout = 10 try: - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) - - if cs.Name == test_dom: - enabState = cs.EnabledState - else: - Globals.logger.error("VS %s is not defined" % test_dom) - - # Success: VS is in Enabled State after Define and Start - if enabState == 2: - status = PASS + # Need to poll for XenFV, since enabState is not getting set otherwise. + for i in range(1, (timeout + 1)): + sleep(1) + cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + if cs.Name == test_dom: + enabState = cs.EnabledState + else: + Globals.logger.error("VS %s is not defined" % test_dom) + # Success: VS is in Enabled State after Define and Start + if enabState == 2: + status = PASS + break except Exception, detail: Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE,
+ # Need to poll for XenFV, since enabState is not getting set otherwise. + for i in range(1, (timeout + 1)): + sleep(1) + cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + if cs.Name == test_dom: + enabState = cs.EnabledState + else: + Globals.logger.error("VS %s is not defined" % test_dom)
You will print this message every time through the loop. Instead, you'll want to break here and then return a failure.
+ # Success: VS is in Enabled State after Define and Start + if enabState == 2: + status = PASS + break
except Exception, detail: Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE,
I'd structure the loop differently: if cs.Name != test_dom: # log error, set status message as failure and break enabState = cs.EnabledState if enabState == 2: # set status and break It's not really much different, but it places the enabState closer together, which makes it a bit easier to read. -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
participants (2)
-
Deepti B. Kalakeri -
Kaitlin Rupert