aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-10-02 17:08:39 +0200
committerTibor Frank <tifrank@cisco.com>2019-10-04 11:22:12 +0000
commit46dfac2e291a0e8ddbae496776d7c0aa7c460330 (patch)
treeab117770d3bcc758ade232023227f956fba0ee37
parent37e192db46d5f607df95ef6c8e9ea69542d06469 (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> (cherry picked from commit 2eb470aa8b86bd11fb6365f0fd9a77ee026dc5aa)
-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 24a24f669f..c63e3eb782 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -283,7 +283,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*)')
@@ -292,7 +292,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]')
@@ -300,7 +300,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.
@@ -460,7 +460,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('"', "'")
@@ -482,7 +482,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('"', "'")