)
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*)(.*)"
: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)
)
}
suite.setup.visit(self)
+ suite.body.visit(self)
+ suite.teardown.visit(self)
def end_suite(self, suite):
"""Called when suite ends.
: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):
: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)
: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)