X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=67aec2f8b1c1005f954f2ee35e2c2614326c8ecf;hp=7499935ee8bd175543600c7f46b40066ab9dab73;hb=7ece7949b9097e44ae4ce12e4dd8b95da5dfbc49;hpb=ecb72fd8f7737e05793bfa92555c7c77b51fa13e

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 7499935ee8..67aec2f8b1 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -263,8 +263,7 @@ class ExecutionChecker(ResultVisitor):
     )
 
     REGEX_VERSION_VPP = re.compile(
-        r"(return STDOUT Version:\s*|"
-        r"VPP Version:\s*|VPP version:\s*)(.*)"
+        r"(VPP Version:\s*|VPP version:\s*)(.*)"
     )
     REGEX_VERSION_DPDK = re.compile(
         r"(DPDK version:\s*|DPDK Version:\s*)(.*)"
@@ -592,14 +591,14 @@ class ExecutionChecker(ResultVisitor):
         :returns: Nothing.
         """
 
-        if msg.message.count(u"return STDOUT Version:") or \
-                msg.message.count(u"VPP Version:") or \
-                msg.message.count(u"VPP version:"):
+        if msg.message.count(u"VPP version:") or \
+                msg.message.count(u"VPP Version:"):
             self._version = str(
                 re.search(self.REGEX_VERSION_VPP, msg.message).group(2)
             )
             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.
@@ -1322,7 +1321,7 @@ class ExecutionChecker(ResultVisitor):
         :type setup_kw: Keyword
         :returns: Nothing.
         """
-        for keyword in setup_kw.body:
+        for keyword in setup_kw.setup:
             if self.start_setup_kw(keyword) is not False:
                 self.visit_setup_kw(keyword)
                 self.end_setup_kw(keyword)
@@ -1450,7 +1449,7 @@ class InputData:
         self._for_output = for_output
 
         # Data store:
-        self._input_data = pd.Series(dtype="object")
+        self._input_data = pd.Series(dtype="float64")
 
     @property
     def data(self):
@@ -1665,7 +1664,7 @@ class InputData:
                     })
 
                     if self._input_data.get(job, None) is None:
-                        self._input_data[job] = pd.Series(dtype="object")
+                        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"]
@@ -1744,7 +1743,7 @@ class InputData:
         })
 
         if self._input_data.get(job, None) is None:
-            self._input_data[job] = pd.Series(dtype="object")
+            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")
@@ -1901,12 +1900,12 @@ class InputData:
                 params.extend((u"type", u"status"))
 
         data_to_filter = data if data else element[u"data"]
-        data = pd.Series(dtype="object")
+        data = pd.Series(dtype="float64")
         try:
             for job, builds in data_to_filter.items():
-                data[job] = pd.Series(dtype="object")
+                data[job] = pd.Series(dtype="float64")
                 for build in builds:
-                    data[job][str(build)] = pd.Series(dtype="object")
+                    data[job][str(build)] = pd.Series(dtype="float64")
                     try:
                         data_dict = dict(
                             self.data[job][str(build)][data_set].items())
@@ -1918,7 +1917,7 @@ 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(dtype="object")
+                                pd.Series(dtype="float64")
                             if params is None:
                                 for param, val in test_data.items():
                                     data[job][str(build)][test_id][param] = val
@@ -2002,12 +2001,12 @@ class InputData:
         else:
             tests = include
 
-        data = pd.Series(dtype="object")
+        data = pd.Series(dtype="float64")
         try:
             for job, builds in element[u"data"].items():
-                data[job] = pd.Series(dtype="object")
+                data[job] = pd.Series(dtype="float64")
                 for build in builds:
-                    data[job][str(build)] = pd.Series(dtype="object")
+                    data[job][str(build)] = pd.Series(dtype="float64")
                     for test in tests:
                         try:
                             reg_ex = re.compile(str(test).lower())
@@ -2017,7 +2016,7 @@ class InputData:
                                     test_data = self.data[job][
                                         str(build)][data_set][test_id]
                                     data[job][str(build)][test_id] = \
-                                        pd.Series(dtype="object")
+                                        pd.Series(dtype="float64")
                                     if params is None:
                                         for param, val in test_data.items():
                                             data[job][str(build)][test_id]\
@@ -2072,7 +2071,7 @@ class InputData:
 
         logging.info(u"    Merging data ...")
 
-        merged_data = pd.Series(dtype="object")
+        merged_data = pd.Series(dtype="float64")
         for builds in data.values:
             for item in builds.values:
                 for item_id, item_data in item.items():