Bug fixes in iperf_client and iperf_server
This CL fixes a bug found in iperf clients over ADB and removes a
debugging print statetment fron the iperf result class.
Test: Done
Bug: None
Change-Id: I8eb0b7b6418ee98429e08a2d346908384776b360
Signed-off-by: Omar El Ayach <oelayach@google.com>
diff --git a/acts/framework/acts/controllers/iperf_client.py b/acts/framework/acts/controllers/iperf_client.py
index 80a8410..f6ec3f4 100644
--- a/acts/framework/acts/controllers/iperf_client.py
+++ b/acts/framework/acts/controllers/iperf_client.py
@@ -259,7 +259,6 @@
Returns:
The iperf result file path.
"""
- iperf_output = ''
try:
if not iperf_binary:
logging.debug('No iperf3 binary specified. '
@@ -279,6 +278,6 @@
full_out_path = self._get_full_file_path(tag)
with open(full_out_path, 'w') as out_file:
- out_file.write('\n'.join(iperf_output))
+ out_file.write('\n'.join(clean_out))
return full_out_path
diff --git a/acts/framework/acts/controllers/iperf_server.py b/acts/framework/acts/controllers/iperf_server.py
index f8048b9..d2ac30b 100755
--- a/acts/framework/acts/controllers/iperf_server.py
+++ b/acts/framework/acts/controllers/iperf_server.py
@@ -144,7 +144,6 @@
The value of the throughput in the appropriate units.
"""
speed_divisor = 1
- print(self.reporting_speed_units)
if self.reporting_speed_units[1:].lower() == 'bytes':
speed_divisor = speed_divisor * BITS_IN_BYTE
if self.reporting_speed_units[0:1].lower() == 'k':
@@ -244,8 +243,8 @@
"""
if not self._has_data():
return None
- instantaneous_rates = self.instantaneous_rates[
- iperf_ignored_interval:-1]
+ instantaneous_rates = self.instantaneous_rates[iperf_ignored_interval:
+ -1]
avg_rate = math.fsum(instantaneous_rates) / len(instantaneous_rates)
sqd_deviations = ([(rate - avg_rate)**2
for rate in instantaneous_rates])
@@ -302,7 +301,7 @@
Note: If the directory for the file path does not exist, it will be
created.
- Args:s
+ Args:
tag: The tag passed in to the server run.
"""
out_dir = self.log_path