Manual whitespace cleanups and coding style fixes
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1665 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index e01f815..4b4deb5 100755
--- a/client/tests/netperf2/netperf2.py
+++ b/client/tests/netperf2/netperf2.py
@@ -8,8 +8,7 @@
# ftp://ftp.netperf.org/netperf/netperf-2.4.1.tar.gz
def setup(self, tarball = 'netperf-2.4.1.tar.gz'):
- tarball = utils.unmap_url(self.bindir, tarball,
- self.tmpdir)
+ tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
autotest_utils.extract_tarball_to_dir(tarball, self.srcdir)
os.chdir(self.srcdir)
@@ -27,8 +26,8 @@
self.client_path = os.path.join(self.srcdir, 'src/netperf')
- def execute(self, server_ip, client_ip, role,
- script='snapshot_script', args=''):
+ def execute(self, server_ip, client_ip, role, script='snapshot_script',
+ args=''):
server_tag = server_ip + '#netperf-server'
client_tag = client_ip + '#netperf-client'
all = [server_tag, client_tag]
@@ -36,10 +35,8 @@
if (role == 'server'):
self.server_start()
try:
- job.barrier(server_tag, 'start',
- 600).rendevous(*all)
- job.barrier(server_tag, 'stop',
- 3600).rendevous(*all)
+ job.barrier(server_tag, 'start', 600).rendevous(*all)
+ job.barrier(server_tag, 'stop', 3600).rendevous(*all)
finally:
self.server_stop()
elif (role == 'client'):