aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-03 16:17:04 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-02-04 07:38:46 +0000
commitd7e307e628ab59298230e919c76c2fb121b5c050 (patch)
treee169793cbad4603af99e8a9f1f8c3dd23862f963
parent9ec98d14d23e42c191992e4ce62374fc1837f25f (diff)
Use python json parser to get the results form the Promise json report
JIRA: FUNCTEST-68 Also, add sleep to let the promise instances terminate, otherwise, clean_openstack will detect them while they are still being removed and will fail. Change-Id: I7a5543143758483eb1d7e06dbe4922e9f1e05cfb Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit 75149a9d278b5a969606ad182fff580c08e37d6c)
-rwxr-xr-xdocker/run_tests.sh1
-rw-r--r--testcases/features/promise.py61
2 files changed, 33 insertions, 29 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index e210afaa2..9d5f681ca 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -173,6 +173,7 @@ test/csit/suites/vpnservice
"promise")
info "Running PROMISE test case..."
python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py --debug ${report}
+ sleep 10 #to let the instances terminate
clean_openstack
;;
"doctor")
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index db017498b..a92029427 100644
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -10,6 +10,7 @@
# Maintainer : jose.lausuch@ericsson.com
#
import argparse
+import json
import logging
import os
import subprocess
@@ -36,7 +37,7 @@ with open('/home/opnfv/functest/conf/config_functest.yaml') as f:
dirs = functest_yaml.get('general').get('directories')
FUNCTEST_REPO = dirs.get('dir_repo_functest')
PROMISE_REPO = dirs.get('dir_repo_promise')
-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
+TEST_DB = functest_yaml.get('results').get('test_db_url')
TENANT_NAME = functest_yaml.get('promise').get('general').get('tenant_name')
TENANT_DESCRIPTION = functest_yaml.get('promise').get(
@@ -199,19 +200,14 @@ def main():
os.chdir(PROMISE_REPO)
- results_file=open('promise-results.json','w+')
- cmd = 'DEBUG=1 npm run -s test -- --reporter json'
- start_time_ts = time.time()
- start_time = time.strftime("%a %b %d %H:%M:%S %Z %Y")
- #'Tue Feb 02 20:37:19 CET 2016'
+ results_file_name='promise-results.json'
+ results_file=open(results_file_name,'w+')
+ cmd = 'npm run -s test -- --reporter json'
logger.info("Running command: %s" % cmd)
ret = subprocess.call(cmd, shell=True, stdout=results_file, \
stderr=subprocess.STDOUT)
results_file.close()
- end_time_ts = time.time()
- end_time = time.strftime("%a %b %d %H:%M:%S %Z %Y")
- duration = round(end_time_ts - start_time_ts, 1)
if ret == 0:
logger.info("The test succeeded.")
@@ -221,27 +217,34 @@ def main():
test_status = "Failed"
# Print output of file
- test_count = 0
- errors = 0
- with open('promise-results.json','r') as results_file:
- for line in results_file:
- print line.replace('\n', '')
- if "title" in line:
- test_count += 1
- if 'err": {' in line and not 'err": {}' in line:
- errors += 1
+ with open(results_file_name,'r') as results_file:
+ data = results_file.read()
+ logger.debug("\n%s" % data)
+ json_data = json.loads(data)
+
+ suites = json_data["stats"]["suites"]
+ tests = json_data["stats"]["tests"]
+ passes = json_data["stats"]["passes"]
+ pending = json_data["stats"]["pending"]
+ failures = json_data["stats"]["failures"]
+ start_time = json_data["stats"]["start"]
+ end_time = json_data["stats"]["end"]
+ duration = float(json_data["stats"]["duration"])/float(1000)
logger.info("\n" \
- "**********************************\n"\
- " Promise test summary\n\n"\
- "**********************************\n\n"\
- " Test start:\t\t%s\n"\
- " Test end:\t\t%s\n"\
- " Execution time:\t%s\n"\
- " Total tests executed:\t%s\n"\
- " Total tests failed:\t%s\n\n"\
- "**********************************\n\n"\
- % (start_time, end_time, duration, test_count, errors))
+ "****************************************\n"\
+ " Promise test report\n\n"\
+ "****************************************\n"\
+ " Suites: \t%s\n"\
+ " Tests: \t%s\n"\
+ " Passes: \t%s\n"\
+ " Pending: \t%s\n"\
+ " Failures:\t%s\n"\
+ " Start: \t%s\n"\
+ " End: \t%s\n"\
+ " Duration:\t%s\n"\
+ "****************************************\n\n"\
+ % (suites, tests, passes, pending, failures, start_time, end_time, duration))
if args.report:
@@ -252,7 +255,7 @@ def main():
url = TEST_DB + "/results"
json_results = {"timestart": start_time, "duration": duration,
- "tests": int(test_count), "failures": int(errors)}
+ "tests": int(tests), "failures": int(failures)}
logger.debug("Results json: "+str(json_results))
params = {"project_name": "promise", "case_name": "promise",