diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-04-21 07:12:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-21 07:12:44 +0000 |
| commit | b4a9b7d14c0c499971bd7e104e76064ec1cc95c7 (patch) | |
| tree | 4b7a743da3a7405f8f866ec92e859186fa1726e5 | |
| parent | 07aba370e18a9acf4bcc7a94b48a7c9f0d631f1d (diff) | |
| parent | c55d6b5dfc8f184a634a40785c84806a7b7922d8 (diff) | |
Merge "bug fix: Rally duration not correct due to result format change"
| -rw-r--r-- | result_collection_api/dashboard/functest2Dashboard.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/result_collection_api/dashboard/functest2Dashboard.py b/result_collection_api/dashboard/functest2Dashboard.py index a2ed308..379b932 100644 --- a/result_collection_api/dashboard/functest2Dashboard.py +++ b/result_collection_api/dashboard/functest2Dashboard.py @@ -117,12 +117,15 @@ def format_vIMS_for_dashboard(results): # Calculate nb of tests run and nb of tests failed # vIMS_results = get_vIMSresults(vIMS_test) # print vIMS_results - if data_test['result'] == "Passed": - nbTests += 1 - elif data_test['result'] == "Failed": - nbFailures += 1 - elif data_test['result'] == "Skipped": - nbSkipped += 1 + try: + if data_test['result'] == "Passed": + nbTests += 1 + elif data_test['result'] == "Failed": + nbFailures += 1 + elif data_test['result'] == "Skipped": + nbSkipped += 1 + except: + nbTests = 0 new_element.append({'x': data['creation_date'], 'y1': nbTests, @@ -149,10 +152,13 @@ def format_vIMS_for_dashboard(results): nbTestsOK = 0 nbTestsKO = 0 - if data_test['result'] == "Passed": - nbTestsOK += 1 - elif data_test['result'] == "Failed": - nbTestsKO += 1 + try: + if data_test['result'] == "Passed": + nbTestsOK += 1 + elif data_test['result'] == "Failed": + nbTestsKO += 1 + except: + nbTestsOK = 0 nbTests += nbTestsOK + nbTestsKO nbFailures += nbTestsKO @@ -366,7 +372,7 @@ def format_Rally_for_dashboard(results): # ******************************** new_element = [] for data in results: - summary_cursor = len(data) + summary_cursor = len(data['details']) - 1 new_element.append({'x': data['creation_date'], 'y': int(data['details'][summary_cursor]['summary']['duration'])}) |