X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=ecc403027d675cd5979212a9b0a1d06a18eb91b3;hb=refs%2Fchanges%2F32%2F36832%2F1;hp=64aab493e480e6c11a0a03a75ebf5913a7ac3775;hpb=7fd5509ba966027c118d3930e7b20d5c080faa9a;p=csit.git diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 64aab493e4..ecc403027d 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -600,6 +600,7 @@ class ExecutionChecker(ResultVisitor): ) self._data[u"metadata"][u"version"] = self._version self._msg_type = None + logging.info(self._version) def _get_dpdk_version(self, msg): """Called when extraction of DPDK version is required. @@ -1043,7 +1044,7 @@ class ExecutionChecker(ResultVisitor): u"level": len(suite.longname.split(u".")) } - suite.keywords.visit(self) + suite.setup.visit(self) def end_suite(self, suite): """Called when suite ends. @@ -1061,7 +1062,7 @@ class ExecutionChecker(ResultVisitor): :returns: Nothing. """ if self.start_test(test) is not False: - test.keywords.visit(self) + test.body.visit(self) self.end_test(test) def start_test(self, test): @@ -1211,11 +1212,6 @@ class ExecutionChecker(ResultVisitor): if test.status == u"PASS": test_result[u"result"], test_result[u"status"] = \ self._get_hoststack_data(test.message, tags) - # elif u"TCP" in tags: # This might be not used - # test_result[u"type"] = u"TCP" - # if test.status == u"PASS": - # groups = re.search(self.REGEX_TCP, test.message) - # test_result[u"result"] = int(groups.group(2)) elif u"RECONF" in tags: test_result[u"type"] = u"RECONF" if test.status == u"PASS": @@ -1285,7 +1281,7 @@ class ExecutionChecker(ResultVisitor): :type test_kw: Keyword :returns: Nothing. """ - for keyword in test_kw.keywords: + for keyword in test_kw.body: if self.start_test_kw(keyword) is not False: self.visit_test_kw(keyword) self.end_test_kw(keyword) @@ -1327,7 +1323,7 @@ class ExecutionChecker(ResultVisitor): :type setup_kw: Keyword :returns: Nothing. """ - for keyword in setup_kw.keywords: + for keyword in setup_kw.body: if self.start_setup_kw(keyword) is not False: self.visit_setup_kw(keyword) self.end_setup_kw(keyword) @@ -1368,7 +1364,7 @@ class ExecutionChecker(ResultVisitor): :type teardown_kw: Keyword :returns: Nothing. """ - for keyword in teardown_kw.keywords: + for keyword in teardown_kw.body: if self.start_teardown_kw(keyword) is not False: self.visit_teardown_kw(keyword) self.end_teardown_kw(keyword) @@ -1455,7 +1451,7 @@ class InputData: self._for_output = for_output # Data store: - self._input_data = pd.Series() + self._input_data = pd.Series(dtype="float64") @property def data(self): @@ -1543,11 +1539,11 @@ class InputData: result.visit(checker) checker.data[u"metadata"][u"tests_total"] = \ - result.statistics.total.all.total + result.statistics.total.total checker.data[u"metadata"][u"tests_passed"] = \ - result.statistics.total.all.passed + result.statistics.total.passed checker.data[u"metadata"][u"tests_failed"] = \ - result.statistics.total.all.failed + result.statistics.total.failed checker.data[u"metadata"][u"elapsedtime"] = result.suite.elapsedtime checker.data[u"metadata"][u"generated"] = result.suite.endtime[:14] @@ -1670,7 +1666,7 @@ class InputData: }) if self._input_data.get(job, None) is None: - self._input_data[job] = pd.Series() + self._input_data[job] = pd.Series(dtype="float64") self._input_data[job][str(build_nr)] = build_data self._cfg.set_input_file_name( job, build_nr, result[u"build"][u"file-name"] @@ -1749,7 +1745,7 @@ class InputData: }) if self._input_data.get(job, None) is None: - self._input_data[job] = pd.Series() + self._input_data[job] = pd.Series(dtype="float64") self._input_data[job][str(build_nr)] = build_data self._cfg.set_input_state(job, build_nr, u"processed") @@ -1906,12 +1902,12 @@ class InputData: params.extend((u"type", u"status")) data_to_filter = data if data else element[u"data"] - data = pd.Series() + data = pd.Series(dtype="float64") try: for job, builds in data_to_filter.items(): - data[job] = pd.Series() + data[job] = pd.Series(dtype="float64") for build in builds: - data[job][str(build)] = pd.Series() + data[job][str(build)] = pd.Series(dtype="float64") try: data_dict = dict( self.data[job][str(build)][data_set].items()) @@ -1922,7 +1918,8 @@ class InputData: for test_id, test_data in data_dict.items(): if eval(cond, {u"tags": test_data.get(u"tags", u"")}): - data[job][str(build)][test_id] = pd.Series() + data[job][str(build)][test_id] = \ + pd.Series(dtype="float64") if params is None: for param, val in test_data.items(): data[job][str(build)][test_id][param] = val @@ -2006,12 +2003,12 @@ class InputData: else: tests = include - data = pd.Series() + data = pd.Series(dtype="float64") try: for job, builds in element[u"data"].items(): - data[job] = pd.Series() + data[job] = pd.Series(dtype="float64") for build in builds: - data[job][str(build)] = pd.Series() + data[job][str(build)] = pd.Series(dtype="float64") for test in tests: try: reg_ex = re.compile(str(test).lower()) @@ -2020,7 +2017,8 @@ class InputData: if re.match(reg_ex, str(test_id).lower()): test_data = self.data[job][ str(build)][data_set][test_id] - data[job][str(build)][test_id] = pd.Series() + data[job][str(build)][test_id] = \ + pd.Series(dtype="float64") if params is None: for param, val in test_data.items(): data[job][str(build)][test_id]\ @@ -2075,7 +2073,7 @@ class InputData: logging.info(u" Merging data ...") - merged_data = pd.Series() + merged_data = pd.Series(dtype="float64") for builds in data.values: for item in builds.values: for item_id, item_data in item.items():