diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-05-10 07:53:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-10 07:53:46 +0000 |
| commit | ce80dec85ee484d5c0cd6ed2a48c60529938a706 (patch) | |
| tree | 0421a847abb8d90a6d9030c8d1c4a0a601c44cb0 /functest/ci | |
| parent | 1fc80d52c05b773bf9d1b1004d53c8e6ab36b655 (diff) | |
| parent | a212763c3e9f4cf6d52200aa614e42a911c5dbf7 (diff) | |
Merge changes from topic 'add_testcase_str'
* changes:
Remove the former results in DB url
Implement TestCase __str__()
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/generate_report.py | 6 | ||||
| -rwxr-xr-x | functest/ci/run_tests.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 17240e8c..e400b1b6 100644 --- a/functest/ci/generate_report.py +++ b/functest/ci/generate_report.py @@ -39,8 +39,8 @@ def init(tiers_to_run=[]): def get_results_from_db(): - url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + url = "%s?build_tag=%s" % (ft_utils.get_db_url(), + CONST.BUILD_TAG) logger.debug("Query to rest api: %s" % url) try: data = json.load(urllib2.urlopen(url)) @@ -56,7 +56,7 @@ def get_data(test, results): for test_db in results: if test['test_name'] in test_db['case_name']: id = test_db['_id'] - url = ft_utils.get_db_url() + '/results/' + id + url = ft_utils.get_db_url() + '/' + id test_result = test_db['criteria'] return {"url": url, "result": test_result} diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index ae002c2e..1396644f 100755 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -155,6 +155,7 @@ def run_test(test, tier_name, testcases=None): test_case.push_to_db() result = test_case.is_successful() duration = test_case.get_duration() + logger.info("\n%s\n", test_case) except ImportError: logger.exception("Cannot import module {}".format( run_dict['module'])) @@ -167,8 +168,6 @@ def run_test(test, tier_name, testcases=None): if test.needs_clean() and GlobalVariables.CLEAN_FLAG: cleanup() - logger.info("Test execution time: %s", duration) - if result != testcase.TestCase.EX_OK: logger.error("The test case '%s' failed. " % test_name) GlobalVariables.OVERALL_RESULT = Result.EX_ERROR |