From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 24 Dec 2015 17:16:26 +0000 (+0100)
Subject: Fix timeout in vPing when booting a VM
X-Git-Tag: 0.2~1855
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=abe4c7197f4c04e39757889e8b4db496569aef9f;p=functest-xtesting.git

Fix timeout in vPing when booting a VM

Change-Id: I9ee487dd5e142d2e92a92b0ba4ccc80b1a4cd063
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index cc52f5ab..d9ceb2f6 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