PAL: suite visitor

[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 ecc4030..556eab1 100644 (file)
--- 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,9 +591,8 @@ 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)
             )
@@ -1045,6 +1043,8 @@ class ExecutionChecker(ResultVisitor):
                               }
 
         suite.setup.visit(self)
+        suite.body.visit(self)
+        suite.teardown.visit(self)
 
     def end_suite(self, suite):
         """Called when suite ends.
@@ -1062,7 +1062,9 @@ class ExecutionChecker(ResultVisitor):
         :returns: Nothing.
         """
         if self.start_test(test) is not False:
+            test.setup.visit(self)
             test.body.visit(self)
+            test.teardown.visit(self)
             self.end_test(test)
 
     def start_test(self, test):
@@ -1256,9 +1258,9 @@ class ExecutionChecker(ResultVisitor):
         :returns: Nothing.
         """
         try:
-            if keyword.type == u"setup":
+            if keyword.type in ("setup", "SETUP"):
                 self.visit_setup_kw(keyword)
-            elif keyword.type == u"teardown":
+            elif keyword.type in ("teardown", "TEARDOWN"):
                 self.visit_teardown_kw(keyword)
             else:
                 self.visit_test_kw(keyword)
@@ -1323,6 +1325,10 @@ class ExecutionChecker(ResultVisitor):
         :type setup_kw: Keyword
         :returns: Nothing.
         """
+        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)
         for keyword in setup_kw.body:
             if self.start_setup_kw(keyword) is not False:
                 self.visit_setup_kw(keyword)