X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=2f8f16770174019cf0fa50f642a53623b38a657a;hp=ecc403027d675cd5979212a9b0a1d06a18eb91b3;hb=04a2073a40aba68cbdda9c168fef18b8346e5122;hpb=b6274cee47c4cbf60c8ec50e6cc6e463c380521a diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index ecc403027d..2f8f167701 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -263,7 +263,6 @@ class ExecutionChecker(ResultVisitor): ) REGEX_VERSION_VPP = re.compile( - r"(return STDOUT Version:\s*|" r"VPP Version:\s*|VPP version:\s*)(.*)" ) REGEX_VERSION_DPDK = re.compile( @@ -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) ) @@ -1323,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)