minor bug fixes

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

2 files changed, 18 insertions, 21 deletions

diff --git a/reporting/functest/reporting-status.py b/reporting/functest/reporting-status.py
index b76f783..622c375 100644
--- a/reporting/functest/reporting-status.py
+++ b/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/reporting/functest/reporting-tempest.py b/reporting/functest/reporting-tempest.py
index 6da18c4..e3f4e33 100644
--- a/reporting/functest/reporting-tempest.py
+++ b/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 = {}