REGEX_VERSION_VPP = re.compile(r"(return STDOUT Version:\s*|"
r"VPP Version:\s*|VPP version:\s*)(.*)")
- REGEX_VERSION_DPDK = re.compile(r"DPDK Version: (\d*.\d*)")
+ REGEX_VERSION_DPDK = re.compile(r"(DPDK version:\s*|DPDK Version:\s*)(.*)")
REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$')
if msg.message.count("DPDK Version:"):
try:
self._version = str(re.search(
- self.REGEX_VERSION_DPDK, msg.message). group(1))
+ self.REGEX_VERSION_DPDK, msg.message). group(2))
self._data["metadata"]["version"] = self._version
except IndexError:
pass
else:
if any(row[1:]):
txt_table.add_row(row)
+ txt_table.set_style(prettytable.MSWORD_FRIENDLY)
txt_table.align["Name"] = "l"
txt_table.align["Calls"] = "r"
txt_table.align["Vectors"] = "r"
txt_table.align["Suspends"] = "r"
txt_table.align["Clocks"] = "r"
- text += txt_table.get_html_string(sortby="Name") + '\n'
+ text += txt_table.get_string(sortby="Name") + '\n'
- text = text.replace('\n', '').replace('\r', '')
+ text = text.replace('\n', ' |br| ').replace('\r', '').\
+ replace('"', "'")
try:
self._data["tests"][self._test_ID]["show-run"] += " |br| "
self._data["tests"][self._test_ID]["show-run"] += \