diff options
| author |   Tibor Frank <tifrank@cisco.com> | 2018-07-10 13:23:47 +0200 |
|---|---|---|
| committer | Tibor Frank <tifrank@cisco.com> | 2018-07-11 06:17:02 +0000 |
| commit | f4906bea17b3db7a57713d04c795a8e88df45604 (patch) | |
| tree | 2de52de2e59bd3d2a334f98ad7db6f297aa5d941 | |
| parent | 872afaeb84d70de7b0c01336a9d1f6da611f3438 (diff) | |
CSIT-1183: Process the new and the old TC names
Change-Id: I7fcecd7e23494e8fb0e70e7af00408eed16733e4
Signed-off-by: Tibor Frank <tifrank@cisco.com>
| -rw-r--r-- | resources/tools/presentation/generator_CPTA.py | 1 | ||||
| -rw-r--r-- | resources/tools/presentation/input_data_parser.py | 29 |
2 files changed, 28 insertions, 2 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py index f96fab0f88..99fc82170a 100644 --- a/resources/tools/presentation/generator_CPTA.py +++ b/resources/tools/presentation/generator_CPTA.py @@ -312,7 +312,6 @@ def _generate_all_charts(spec, input_data): csv_tbl.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n') # Generate traces: traces = list() - win_size = 14 index = 0 for test_name, test_data in chart_data.items(): if not test_data: diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 57ec935de1..d3e83fd041 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -484,6 +484,7 @@ class ExecutionChecker(ResultVisitor): test_result["msg"] = test.message.replace('\n', ' |br| '). \ replace('\r', '').replace('"', "'") test_result["status"] = test.status + self._test_ID = test.longname.lower() if test.status == "PASS" and ("NDRPDRDISC" in tags or "TCP" in tags or "MRR" in tags or @@ -503,6 +504,33 @@ class ExecutionChecker(ResultVisitor): test_result["type"] = test_type + # Replace info about cores (e.g. -1c-) with the info about threads + # and cores (e.g. -1t1c-) in the long test case names and in the + # test case names if necessary. + groups = re.search(self.REGEX_TC_NAME_OLD, self._test_ID) + if not groups: + tag_count = 0 + for tag in test_result["tags"]: + groups = re.search(self.REGEX_TC_TAG, tag) + if groups: + tag_count += 1 + tag_tc = tag + + if tag_count == 1: + self._test_ID = re.sub(self.REGEX_TC_NAME_NEW, + "-{0}-".format(tag_tc.lower()), + self._test_ID, + count=1) + test_result["name"] = re.sub(self.REGEX_TC_NAME_NEW, + "-{0}-".format(tag_tc.lower()), + test_result["name"], + count=1) + else: + test_result["status"] = "FAIL" + logging.error("The test '{0}' has no or more than one " + "multi-threading tags.".format(self._test_ID)) + return + if test_type in ("NDR", "PDR"): try: rate_value = str(re.search( @@ -546,7 +574,6 @@ class ExecutionChecker(ResultVisitor): AvgStdevMetadataFactory.from_data([ float(groups.group(3)) / float(groups.group(1)), ]) - self._test_ID = test.longname.lower() self._data["tests"][self._test_ID] = test_result def end_test(self, test): |