Bugfix:[yardstick reporting] reporting status is not true due to select a wrong keyword

[releng.git] / utils / test / reporting / yardstick / reporting-status.py

diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py
index ed5dab0..d7a4e29 100644 (file)
--- a/utils/test/reporting/yardstick/reporting-status.py
+++ b/utils/test/reporting/yardstick/reporting-status.py
@@ -32,6 +32,12 @@ for version in conf.versions:
     for installer in conf.installers:
         # get scenarios results data
         scenario_results = utils.getScenarioStatus(installer, version)
+        if 'colorado' == version:
+            stable_result = utils.getScenarioStatus(installer, 'stable/colorado')
+            for k,v in stable_result.items():
+                if not scenario_results.has_key(k):
+                    scenario_results[k] = []
+                scenario_results[k] += stable_result[k]
         scenario_result_criteria = {}
 
         # From each scenarios get results list
@@ -44,10 +50,10 @@ for version in conf.versions:
             scenario_score = 0
 
             for v in s_result:
-                if v['details'] == 'SUCCESS':
+                if v['criteria'] == 'SUCCESS':
                     scenario_score += 1
 
-            if scenario_score == scenario_criteria:
+            if scenario_score == scenario_criteria and scenario_criteria == 4:
                 s_status = 'OK'
                 logger.info(">>>>> scenario OK, save the information")
             else:
@@ -59,7 +65,7 @@ for version in conf.versions:
             logger.info("--------------------------")
 
         templateLoader = jinja2.FileSystemLoader(conf.REPORTING_PATH)
-        templateEnv = jinja2.Environment(loader=templateLoader)
+        templateEnv = jinja2.Environment(loader=templateLoader, autoescape=True)
 
         TEMPLATE_FILE = "/template/index-status-tmpl.html"
         template = templateEnv.get_template(TEMPLATE_FILE)