aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-10-02 17:08:39 +0200
committerVratko Polak <vrpolak@cisco.com>2019-10-02 17:08:39 +0200
commit2eb470aa8b86bd11fb6365f0fd9a77ee026dc5aa (patch)
tree033be37c64c7605a0dcf31f462c693bf3f9bcb9e
parent22909e959314d5a48f6e20aa5a6696e320f02aa2 (diff)
PAL: Accept reconf time in scientific notation
+ Otherwise "9.58828205237e-05" is understood as "9.58828205237". + Replace "[0-9]" with "\d". Change-Id: I7ecf6d0116fe704ecdba46f3a0e7975aba79aa62 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-rw-r--r--resources/tools/presentation/input_data_parser.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 7e2abe6dbf..a4eb70bccc 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -220,7 +220,7 @@ class ExecutionChecker(ResultVisitor):
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]*).*$')
+ REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s(\d*).*$')
REGEX_MRR = re.compile(r'MaxReceivedRate_Results\s\[pkts/(\d*)sec\]:\s'
r'tx\s(\d*),\srx\s(\d*)')
@@ -229,7 +229,7 @@ class ExecutionChecker(ResultVisitor):
r' in packets per second: \[(.*)\]')
REGEX_RECONF_LOSS = re.compile(r'Packets lost due to reconfig: (\d*)')
- REGEX_RECONF_TIME = re.compile(r'Implied time lost: (\d*.\d*)')
+ REGEX_RECONF_TIME = re.compile(r'Implied time lost: (\d*.[\de-]*)')
REGEX_TC_TAG = re.compile(r'\d+[tT]\d+[cC]')
@@ -237,7 +237,7 @@ class ExecutionChecker(ResultVisitor):
REGEX_TC_NAME_NEW = re.compile(r'-\d+[cC]-')
- REGEX_TC_NUMBER = re.compile(r'tc[0-9]{2}-')
+ REGEX_TC_NUMBER = re.compile(r'tc\d{2}-')
def __init__(self, metadata, mapping, ignore):
"""Initialisation.
@@ -397,7 +397,7 @@ class ExecutionChecker(ResultVisitor):
self._data["tests"][self._test_ID]["conf-history"] = str()
else:
self._msg_type = None
- text = re.sub("[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3} "
+ text = re.sub("\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3} "
"VAT command history:", "", msg.message, count=1). \
replace("\n\n", "\n").replace('\n', ' |br| ').\
replace('\r', '').replace('"', "'")
@@ -419,7 +419,7 @@ class ExecutionChecker(ResultVisitor):
self._data["tests"][self._test_ID]["conf-history"] = str()
else:
self._msg_type = None
- text = re.sub("[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3} "
+ text = re.sub("\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3} "
"PAPI command history:", "", msg.message, count=1). \
replace("\n\n", "\n").replace('\n', ' |br| ').\
replace('\r', '').replace('"', "'")