From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 29 Jun 2016 14:25:25 +0000 (+0200)
Subject: bug fix: use FAIL/PASS as criteria for vping_userdata and rally_sanity
X-Git-Tag: 0.2~1458
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3e0c573b1ead3547a6a1e73b491680e15a9d5cad;p=functest-xtesting.git

bug fix: use FAIL/PASS as criteria for vping_userdata and rally_sanity

Change-Id: Iadccae118bb2dc557bb590175c65022c1ed70605
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---

diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 8afbccaa..78393224 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -355,10 +355,10 @@ def run_task(test_name):
         json_data = json.load(json_file)
 
     """ parse JSON operation result """
-    status = "failed"
+    status = "FAIL"
     if task_succeed(json_results):
         logger.info('Test scenario: "{}" OK.'.format(test_name) + "\n")
-        status = "passed"
+        status = "PASS"
     else:
         logger.info('Test scenario: "{}" Failed.'.format(test_name) + "\n")
 
diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py
index ff7158ee..cdc41194 100644
--- a/testcases/OpenStack/vPing/vPing_userdata.py
+++ b/testcases/OpenStack/vPing/vPing_userdata.py
@@ -347,10 +347,10 @@ def main():
                 logger.debug("Pinging %s. Waiting for response..." % test_ip)
         sec += 1
 
-    test_status = "NOK"
+    test_status = "FAIL"
     if EXIT_CODE == 0:
         logger.info("vPing OK")
-        test_status = "OK"
+        test_status = "PASS"
     elif EXIT_CODE == -2:
         duration = 0
         logger.info("Userdata is not supported in nova boot. Aborting test...")