commit 2d168635858b60503dedd1c924f5bedaff0a1f2c
Author: Artem Savkov <asavkov(a)redhat.com>
Date: Fri Mar 27 17:21:00 2015 +0100
iperf: regexp update
Updating iperf output parsing regexp to a slightly more flexible version. This
still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option
which can be added through iperf_options)
Signed-off-by: Artem Savkov <asavkov(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
test_modules/Iperf.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py
index 8e5bd67..1d8735b 100644
--- a/test_modules/Iperf.py
+++ b/test_modules/Iperf.py
@@ -90,7 +90,7 @@ class Iperf(TestGeneric):
logging.info("Iperf connection failed!")
return (False, "Iperf connection failed!")
- m = re.search("\[[^0-9]*[0-9]*\]\s*0.0-\s*\d*\.\d sec\s*\d*(\.\d*){0,1}\s*[
kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
+ m =
re.search("\[[^0-9]*[0-9]*\]\s*0.0+-\s*\d*\.\d+\s*sec\s*\d*(\.\d*){0,1}\s*[
kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
if m is None:
logging.info("Could not get performance throughput!")
return (False, "Could not get performance throughput!")
Show replies by date