summaryrefslogtreecommitdiffstats
path: root/testcases/vPing/CI
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-12-24 18:16:26 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2015-12-24 18:19:04 +0100
commitabe4c7197f4c04e39757889e8b4db496569aef9f (patch)
treeddedc6227829b3a8faabc0cbaad8e122f53e25e7 /testcases/vPing/CI
parent4a2e0aeb8d7b8260d3a8dabed3da9516db7ed527 (diff)
Fix timeout in vPing when booting a VM
Change-Id: I9ee487dd5e142d2e92a92b0ba4ccc80b1a4cd063 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'testcases/vPing/CI')
-rw-r--r--testcases/vPing/CI/libraries/vPing.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index cc52f5ab6..d9ceb2f6d 100644
--- a/testcases/vPing/CI/libraries/vPing.py
+++ b/testcases/vPing/CI/libraries/vPing.py
@@ -121,9 +121,12 @@ def waitVmActive(nova, vm):
logger.debug("Status: %s" % status)
if status == "ACTIVE":
return True
- if status == "ERROR" or count == 0:
+ if status == "ERROR" or status == "error":
return False
- count -= 1
+ if count == 0:
+ logger.debug("Booting a VM timed out...")
+ return False
+ count -= 1
time.sleep(sleep_time)
return False