diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-07-07 09:33:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-07 09:33:59 +0000 |
| commit | 7da6a34ec936d6ac9c8998429618aa4fb79eb74c (patch) | |
| tree | 75565f82e870c75574115b0891c5a6b13567fd71 | |
| parent | 2d488dc5f66922247839d812b7be68b4674b583b (diff) | |
| parent | 32c3baf053e5e1e086115026c83ba2eff0cb3219 (diff) | |
Merge "minor bug fixes"
| -rw-r--r-- | utils/test/reporting/functest/reporting-status.py | 29 | ||||
| -rw-r--r-- | utils/test/reporting/functest/reporting-tempest.py | 10 |
2 files changed, 18 insertions, 21 deletions
diff --git a/utils/test/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py index b76f783fc..622c375cc 100644 --- a/utils/test/reporting/functest/reporting-status.py +++ b/utils/test/reporting/functest/reporting-status.py @@ -112,20 +112,19 @@ for version in conf.versions: logger.info(" Searching results for case %s " % (displayName)) result = utils.getResult(dbName, installer, s, version) - # at least 1 result for the test - if result > -1: - logger.info(" >>>> Test score = " + str(result)) - test_case.setCriteria(result) - test_case.setIsRunnable(True) - testCases2BeDisplayed.append(tc.TestCase(name, - project, - "", - result, - True, - 1)) - scenario_score = scenario_score + result - else: - logger.debug("No results found") + # if no result set the value to 0 + if result < 0: + result = 0 + logger.info(" >>>> Test score = " + str(result)) + test_case.setCriteria(result) + test_case.setIsRunnable(True) + testCases2BeDisplayed.append(tc.TestCase(name, + project, + "", + result, + True, + 1)) + scenario_score = scenario_score + result # 2) Manage the test cases for the scenario qualification # concretely Tiers > 3 @@ -181,7 +180,7 @@ for version in conf.versions: else: logger.info(">>>>> scenario OK, save the information") s_status = "OK" - path_validation_file = ("./release/" + version + + path_validation_file = (conf.REPORTING_PATH + "/release/" + version + "/validated_scenario_history.txt") with open(path_validation_file, "a") as f: time_format = "%Y-%m-%d %H:%M" diff --git a/utils/test/reporting/functest/reporting-tempest.py b/utils/test/reporting/functest/reporting-tempest.py index 6da18c425..e3f4e3306 100644 --- a/utils/test/reporting/functest/reporting-tempest.py +++ b/utils/test/reporting/functest/reporting-tempest.py @@ -19,11 +19,10 @@ logger.info("* Data retention = %s days *" % PERIOD) logger.info("* *") logger.info("************************************************") -logger.info("Success criteria: nb tests executed > %s s," + - "test duration < %s s," + - "success rate > %s " % (criteria_nb_test, - criteria_duration, - criteria_success_rate)) +logger.info("Success criteria:") +logger.info("nb tests executed > %s s " % criteria_nb_test) +logger.info("test duration < %s s " % criteria_duration) +logger.info("success rate > %s " % criteria_success_rate) for installer in installers: # we consider the Tempest results of the last PERIOD days @@ -40,7 +39,6 @@ for installer in installers: logger.error("Error code: %s" % e) test_results = results['results'] - test_results.reverse() scenario_results = {} criteria = {} |