Trending: Fix Alerts

[csit.git] / resources / tools / presentation / input_data_parser.py

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 1177def..d23fa84 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -404,9 +404,9 @@ class ExecutionChecker(ResultVisitor):
             else:
                 self._msg_type = None
             text = re.sub(r"\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3} "
-                          r"VAT command history:", u"", msg.message, count=1). \
-                replace(u"\n\n", u"\n").replace(u'\n', u' |br| ').\
-                replace(u'\r', u'').replace(u'"', u"'")
+                          r"VAT command history:", u"",
+                          msg.message, count=1).replace(u'\n', u' |br| ').\
+                replace(u'"', u"'")
 
             self._data[u"tests"][self._test_id][u"conf-history"] += (
                 f" |br| **DUT{str(self._conf_history_lookup_nr)}:** {text}"
@@ -427,9 +427,8 @@ class ExecutionChecker(ResultVisitor):
                 self._msg_type = None
             text = re.sub(r"\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3} "
                           r"PAPI command history:", u"",
-                          msg.message, count=1). \
-                replace(u"\n\n", u"\n").replace(u'\n', u' |br| ').\
-                replace(u'\r', u'').replace(u'"', u"'")
+                          msg.message, count=1).replace(u'\n', u' |br| ').\
+                replace(u'"', u"'")
 
             self._data[u"tests"][self._test_id][u"conf-history"] += (
                 f" |br| **DUT{str(self._conf_history_lookup_nr)}:** {text}"
@@ -443,14 +442,24 @@ class ExecutionChecker(ResultVisitor):
         :type msg: Message
         :returns: Nothing.
         """
+
         if u"show-run" not in self._data[u"tests"][self._test_id].keys():
             self._data[u"tests"][self._test_id][u"show-run"] = str()
 
-        if msg.message.count(u"stats runtime"):
-            host = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message).
-                       group(1))
-            socket = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message).
-                         group(2))
+        if msg.message.count(u"stats runtime") or \
+                msg.message.count(u"Runtime"):
+            try:
+                host = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message).
+                           group(1))
+            except (AttributeError, IndexError):
+                host = self._data[u"tests"][self._test_id][u"show-run"].\
+                           count(u"DUT:") + 1
+            try:
+                socket = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message).
+                             group(2))
+                socket = f"/{socket}"
+            except (AttributeError, IndexError):
+                socket = u""
             runtime = loads(
                 str(msg.message).
                 replace(u' ', u'').
@@ -519,7 +528,7 @@ class ExecutionChecker(ResultVisitor):
                 txt_table.align[u"Vectors/Calls"] = u"r"
 
                 text += txt_table.get_string(sortby=u"Name") + u'\n'
-            text = f" \n **DUT: {host}/{socket}** \n {text}".\
+            text = f" \n**DUT: {host}{socket}**\n{text}".\
                 replace(u'\n', u' |br| ').\
                 replace(u'\r', u'').\
                 replace(u'"', u"'")
@@ -620,7 +629,7 @@ class ExecutionChecker(ResultVisitor):
             :throws IndexError: If in_str does not have enough substrings.
             :throws ValueError: If a substring does not convert to float.
             """
-            in_list = in_str.split('/')
+            in_list = in_str.split('/', 3)
 
             rval = {
                 u"min": float(in_list[0]),