X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_cpta.py;h=f63caa40afeeaec4478f507fab197d1e49539024;hb=refs%2Fchanges%2F41%2F22341%2F49;hp=3003557696daa9bfff1489b1a8318652ec3354bf;hpb=cbfa26dc0f5334bcd367c161b4eaad342355bbde;p=csit.git diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py index 3003557696..f63caa40af 100644 --- a/resources/tools/presentation/generator_cpta.py +++ b/resources/tools/presentation/generator_cpta.py @@ -353,8 +353,15 @@ def _generate_all_charts(spec, input_data): f"{graph.get(u'title', u'')}." ) ) - data = input_data.filter_data(graph, continue_on_error=True) - if data is None: + + if graph.get(u"include", None): + data = input_data.filter_tests_by_name( + graph, continue_on_error=True + ) + else: + data = input_data.filter_data(graph, continue_on_error=True) + + if data is None or data.empty: logging.error(u"No data.") return dict() @@ -496,7 +503,7 @@ def _generate_all_charts(spec, input_data): ]) name_file = ( - f"{spec.cpta[u'output-file']}-{graph[u'output-file-name']}" + f"{spec.cpta[u'output-file']}/{graph[u'output-file-name']}" f"{spec.cpta[u'output-file-type']}") logs.append((u"INFO", f" Writing the file {name_file} ...")) @@ -611,7 +618,7 @@ def _generate_all_charts(spec, input_data): result = u"PASS" for job_name, job_data in anomaly_classifications.items(): file_name = \ - f"{spec.cpta[u'output-file']}-regressions-{job_name}.txt" + f"{spec.cpta[u'output-file']}/regressions-{job_name}.txt" with open(file_name, u'w') as txt_file: for test_name, classification in job_data.items(): if classification == u"regression": @@ -619,7 +626,7 @@ def _generate_all_charts(spec, input_data): if classification in (u"regression", u"outlier"): result = u"FAIL" file_name = \ - f"{spec.cpta[u'output-file']}-progressions-{job_name}.txt" + f"{spec.cpta[u'output-file']}/progressions-{job_name}.txt" with open(file_name, u'w') as txt_file: for test_name, classification in job_data.items(): if classification == u"progression":