Changed netperf iperf and netpipe with respect to increasing the barrier
timeouts as well as making the barrier tags more specific.
Signed-off-by: Bryce Boe <bboe@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2164 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index 3399612..456ec9c 100755
--- a/client/tests/netperf2/netperf2.py
+++ b/client/tests/netperf2/netperf2.py
@@ -46,22 +46,25 @@
if role == 'server':
self.server_start()
try:
- # Wait up to five minutes for the client to reach this
+ # Wait up to ten minutes for the client to reach this
# point.
- self.job.barrier(server_tag, 'start', 300).rendevous(*all)
- # Wait up to test_time + 1 minute for the test to
+ self.job.barrier(server_tag, 'start_%d' % num_streams,
+ 600).rendevous(*all)
+ # Wait up to test_time + 5 minutes for the test to
# complete
- self.job.barrier(server_tag, 'stop',
- test_time+60).rendevous(*all)
+ self.job.barrier(server_tag, 'stop_%d' % num_streams,
+ test_time+300).rendevous(*all)
finally:
self.server_stop()
elif role == 'client':
- # Wait up to five minutes for the server to start
- self.job.barrier(client_tag, 'start', 300).rendevous(*all)
+ # Wait up to ten minutes for the server to start
+ self.job.barrier(client_tag, 'start_%d' % num_streams,
+ 600).rendevous(*all)
self.client(server_ip, test, test_time, num_streams)
- # Wait up to 1 minute for the server to also reach this point
- self.job.barrier(client_tag, 'stop', 60).rendevous(*all)
+ # Wait up to 5 minutes for the server to also reach this point
+ self.job.barrier(client_tag, 'stop_%d' % num_streams,
+ 300).rendevous(*all)
else:
raise error.TestError('invalid role specified')