Few comments here, since it's a cleanup :)
On 08/23/2012 06:38 PM, Lucas Meneghel Rodrigues wrote:
Signed-off-by: Lucas Meneghel Rodrigues<[email protected]>
---
client/virt/tests/fail.py | 2 --
client/virt/tests/iofuzz.py | 2 +-
client/virt/tests/jumbo.py | 4 ++--
client/virt/tests/module_probe.py | 2 +-
client/virt/tests/netperf.py | 4 ++--
client/virt/tests/nicdriver_unload.py | 2 +-
client/virt/tests/ntttcp.py | 14 +++++++-------
client/virt/tests/vlan.py | 2 +-
client/virt/tests/whql_submission.py | 2 +-
9 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/client/virt/tests/fail.py b/client/virt/tests/fail.py
index beef1b7..ce13425 100644
--- a/client/virt/tests/fail.py
+++ b/client/virt/tests/fail.py
@@ -1,6 +1,4 @@
-import logging
from autotest.client.shared import error
-from autotest.client.virt import utils_test
def run_fail(test, params, env):
diff --git a/client/virt/tests/iofuzz.py b/client/virt/tests/iofuzz.py
index fb2ee6f..af3d9e1 100644
--- a/client/virt/tests/iofuzz.py
+++ b/client/virt/tests/iofuzz.py
@@ -126,7 +126,7 @@ def run_iofuzz(test, params, env):
inst.append(("write", [port, 0]))
# Write random values to random ports of the range
- for seq in range(fuzz_count * (end - beg + 1)):
+ for _ in range(fuzz_count * (end - beg + 1)):
inst.append(("write",
[r.randint(beg, end), r.randint(0,255)]))
diff --git a/client/virt/tests/jumbo.py b/client/virt/tests/jumbo.py
index 2f5fe90..d17f780 100644
--- a/client/virt/tests/jumbo.py
+++ b/client/virt/tests/jumbo.py
@@ -52,7 +52,7 @@ def run_jumbo(test, params, env):
utils.run(arp_add_cmd)
def is_mtu_ok():
- s, o = utils_test.ping(ip, 1, interface=ifname,
+ s, _ = utils_test.ping(ip, 1, interface=ifname,
packetsize=max_icmp_pkt_size,
hint="do", timeout=2)
return s == 0
@@ -78,7 +78,7 @@ def run_jumbo(test, params, env):
def large_frame_ping(count=100):
logging.info("Large frame ping")
- s, o = utils_test.ping(ip, count, interface=ifname,
+ _, o = utils_test.ping(ip, count, interface=ifname,
packetsize=max_icmp_pkt_size,
timeout=float(count) * 2)
ratio = utils_test.get_loss_ratio(o)
diff --git a/client/virt/tests/module_probe.py
b/client/virt/tests/module_probe.py
index 0ca89cf..48eae79 100644
--- a/client/virt/tests/module_probe.py
+++ b/client/virt/tests/module_probe.py
@@ -27,7 +27,7 @@ def run_module_probe(test, params, env):
load_count = int(params.get("load_count", 100))
try:
- for i in range(load_count):
+ for _ in range(load_count):
try:
installer_object.load_modules()
except Exception,e:
diff --git a/client/virt/tests/netperf.py b/client/virt/tests/netperf.py
index e137d45..515b682 100644
--- a/client/virt/tests/netperf.py
+++ b/client/virt/tests/netperf.py
@@ -115,8 +115,8 @@ def start_test(server, server_ctl, host, client,
resultsdir, l=60,
def parse_file(file_prefix, raw=""):
""" Parse result files and reture throughput total """
thu = 0
- for file in glob.glob("%s.*.nf" % file_prefix):
- o = commands.getoutput("cat %s |tail -n 1" % file)
Looks to me like extra cleanup opportunity ^:
"tail -n 1 %s"
+ for filename in glob.glob("%s.*.nf" % file_prefix):
+ o = commands.getoutput("cat %s |tail -n 1" % filename)
same ^
try:
thu += float(o.split()[raw])
except:
diff --git a/client/virt/tests/nicdriver_unload.py
b/client/virt/tests/nicdriver_unload.py
index b225f5a..60d5553 100644
--- a/client/virt/tests/nicdriver_unload.py
+++ b/client/virt/tests/nicdriver_unload.py
@@ -39,7 +39,7 @@ def run_nicdriver_unload(test, params, env):
try:
threads = []
- for t in range(int(params.get("sessions_num", "10"))):
+ for _ in range(int(params.get("sessions_num", "10"))):
thread = utils.InterruptedThread(utils_test.run_file_transfer,
(test, params, env))
thread.start()
diff --git a/client/virt/tests/ntttcp.py b/client/virt/tests/ntttcp.py
index c16d120..1edbddf 100644
--- a/client/virt/tests/ntttcp.py
+++ b/client/virt/tests/ntttcp.py
@@ -67,7 +67,7 @@ def run_ntttcp(test, params, env):
# Don't install ntttcp if it's already installed
error.context("NTttcp directory already exists")
session.cmd(params.get("check_ntttcp_cmd"))
- except aexpect.ShellCmdError, e:
+ except aexpect.ShellCmdError:
ntttcp_install_cmd = params.get("ntttcp_install_cmd")
error.context("Installing NTttcp on guest")
session.cmd(ntttcp_install_cmd % (platform, platform),
timeout=200)
@@ -135,13 +135,13 @@ def run_ntttcp(test, params, env):
def parse_file(resultfile):
""" Parse raw result files and generate files with standard format """
- file = open(resultfile, "r")
- list= []
+ fileobj = open(resultfile, "r")
Since read is default, I would personally clean this ^ up to:
open(resultfile)
+ lst= []
found = False
- for line in file.readlines():
+ for line in fileobj.readlines():
o = re.findall("Send buffer size: (\d+)", line)
if o:
- buffer = o[0]
+ bfr = o[0]
if "Total Throughput(Mbit/s)" in line:
found = True
if found:
@@ -150,11 +150,11 @@ def run_ntttcp(test, params, env):
continue
try:
[float(i) for i in fields]
- list.append([buffer, fields[-1]])
+ lst.append([bfr, fields[-1]])
except ValueError:
continue
found = False
- return list
+ return lst
try:
bg = utils.InterruptedThread(receiver, ())
diff --git a/client/virt/tests/vlan.py b/client/virt/tests/vlan.py
index 7af50dc..fe9939e 100644
--- a/client/virt/tests/vlan.py
+++ b/client/virt/tests/vlan.py
@@ -122,7 +122,7 @@ def run_vlan(test, params, env):
for i in range(2):
interface = ifname[i] + '.' + str(vlan)
dest = subnet +'.'+ str(vlan2)+ '.' + ip_unit[(i+1)%2]
- s, o = utils_test.ping(dest, count=2,
+ s, _ = utils_test.ping(dest, count=2,
interface=interface,
session=session[i], timeout=30)
if ((vlan == vlan2) ^ (s == 0)):
diff --git a/client/virt/tests/whql_submission.py
b/client/virt/tests/whql_submission.py
index 548b87f..6bef376 100644
--- a/client/virt/tests/whql_submission.py
+++ b/client/virt/tests/whql_submission.py
@@ -185,7 +185,7 @@ def run_whql_submission(test, params, env):
results = eval("".join(results.splitlines()))
# Download logs and HTML reports from the server
- for i, r in enumerate(results):
+ for r in results:
if "report" in r:
try:
rss_client.download(server_address,
Best regards,
--
Eduardo Bacchi Kienetz
Staff Software Engineer
IBM Linux Technology Center
_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel
