Fix bugs in netperf2 barrier support, and a couple of other fixes
git-svn-id: http://test.kernel.org/svn/autotest/trunk@226 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tests/netperf2/netperf2.py b/tests/netperf2/netperf2.py
index ba5db07..31c6488 100755
--- a/tests/netperf2/netperf2.py
+++ b/tests/netperf2/netperf2.py
@@ -26,8 +26,7 @@
hostid = '127.0.0.1#netperf-server'
self.server_start()
job.barrier(hostid, 'start', 30).rendevous(*all)
- job.barrier(hostid, 'stop', 30).rendevous(*all)
- barrier.rendevous(*all)
+ job.barrier(hostid, 'stop', 3600).rendevous(*all)
self.server_stop()
elif (role == 'client'):
hostid = '127.0.0.1#netperf-client'
@@ -43,7 +42,7 @@
# we should really record the pid we forked off, but there
# was no obvious way to run the daemon in the foreground.
# Hacked it for now
- system('killall netserver')
+ system('killall netserver', ignorestatus=1)
system(self.server_path)