summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-06-29 16:25:25 +0200
committerMorgan Richomme <morgan.richomme@orange.com>2016-06-29 16:25:25 +0200
commit3e0c573b1ead3547a6a1e73b491680e15a9d5cad (patch)
tree9e6b9a3f5545eb4961b492069a50e4cdb8f83365
parent130111453725c2155dce0be8ebdd210fa2aa2dff (diff)
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>
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py4
-rw-r--r--testcases/OpenStack/vPing/vPing_userdata.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 8afbccaa3..783932249 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 ff7158ee3..cdc411948 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...")