X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=b6b93018df01969eb8cc617a8f0b2d3635c712ac;hb=82a13664db8e18e12ccff542e24e5a0dbe2fbce4;hp=6742439be6148f8bc7896829d293707ef8b03ff9;hpb=b9aa1c7701f6f261acc4849fb07929c64e3ae692;p=csit.git diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 6742439be6..b6b93018df 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -1182,6 +1182,7 @@ class ExecutionChecker(ResultVisitor): ] # Use whole list in CSIT-1180. stats = jumpavg.AvgStdevStats.for_runs(items_float) + test_result[u"result"][u"samples"] = items_float test_result[u"result"][u"receive-rate"] = stats.avg test_result[u"result"][u"receive-stdev"] = stats.stdev else: @@ -1953,16 +1954,25 @@ class InputData: if params is None: params = element.get(u"parameters", None) - if params: + if params and u"type" not in params: params.append(u"type") + cores = element.get(u"core", None) + if cores: + tests = list() + for core in cores: + for test in include: + tests.append(test.format(core=core)) + else: + tests = include + data = pd.Series() try: for job, builds in element[u"data"].items(): data[job] = pd.Series() for build in builds: data[job][str(build)] = pd.Series() - for test in include: + for test in tests: try: reg_ex = re.compile(str(test).lower()) for test_id in self.data[job][