summaryrefslogtreecommitdiff
path: root/validation
diff options
context:
space:
mode:
authorOlivier Dufour2013-06-07 11:04:11 +0200
committerOlivier Dufour2013-06-07 16:34:31 +0200
commitbbeef9d1f66b75be9e407aabd3a348f9a9225d6a (patch)
tree08353e455202973ad55caeaa87dc871cb1bb721d /validation
parent14b0723501156e8248d184d94db5507730ea236b (diff)
validation/test/av_home: handle max throughput result, refs #4042
Diffstat (limited to 'validation')
-rwxr-xr-xvalidation/test/av_home/av_home.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/validation/test/av_home/av_home.py b/validation/test/av_home/av_home.py
index 4a2f9a930b..faff2ffc58 100755
--- a/validation/test/av_home/av_home.py
+++ b/validation/test/av_home/av_home.py
@@ -152,7 +152,7 @@ def prepare_points (mode):
f = open (os.path.join (av_home_attr.output_dir, "%s_plot" % mode), "w")
for i in id:
res = []
- pattern = r"^\[ *%s\] *[0-9]+\.0- *[0-9]+\.0.*([0-9]+\.?[0-9]+) [KM]Bytes *([0-9]+\.[0-9]+).*" % i
+ pattern = r"^\[ *%s\] *[0-9]+\.0- *[0-9]+\.0.*([0-9]+\.?[0-9]*) [KM]Bytes *([0-9]+\.?[0-9]*).*" % i
val_re = re.compile (pattern)
for l in lines:
result = val_re.match (l)
@@ -189,7 +189,7 @@ def get_general_result (mode):
# Get average up and down throughput
f = open (os.path.join (av_home_attr.output_dir, "server_log"), "r")
lines = f.readlines ()
- result_re = re.compile (r"^.* 0\.0-[0-9]+\.[0-9].* ([0-9]+\.[0-9]+) Mbits/sec")
+ result_re = re.compile (r"^.* 0\.0-[0-9]+\.[0-9].* ([0-9]+.*) Mbits/sec")
avg = ""
for l in lines:
result = result_re.match (l)
@@ -203,10 +203,14 @@ def get_general_result (mode):
f.close ()
f = open (os.path.join (av_home_attr.output_dir, "client_log"), "r")
lines = f.readlines ()
+ server_re = re.compile(r".*Server Report.*")
avg = ""
+ server = 0
for l in lines:
result = result_re.match (l)
- if result:
+ if not server:
+ server = server_re.match (l)
+ if result and server:
avg = result.groups (1)
break
if not avg: