From 9b908a6c0f4d7b02e04b2dc85aea7543928c4c33 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Tue, 13 Sep 2016 00:25:07 +0000 Subject: [PATCH] Bugfix:[yardstick reporting] reporting status is not true due to select a wrong keyword JIRA: RELENG-146 Change-Id: I9bea896c3be02b7533ab170b3e91117499eef06f Signed-off-by: chenjiankun --- utils/test/reporting/yardstick/reporting-status.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py index 546bf08c4..d7a4e2986 100644 --- 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: -- 2.16.6