netperf2: ensure server is killed off
When we error out its very important that the server is not
left running. The server is part of this test and should
live and die with this test, not affect the following tests.
This also ensures autotest can cleanly move on to the next
test.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@371 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tests/netperf2/netperf2.py b/tests/netperf2/netperf2.py
index 7531003..52e4129 100755
--- a/tests/netperf2/netperf2.py
+++ b/tests/netperf2/netperf2.py
@@ -27,9 +27,13 @@
job = self.job
if (role == 'server'):
self.server_start()
- job.barrier(server_tag, 'start', 30).rendevous(*all)
- job.barrier(server_tag, 'stop', 3600).rendevous(*all)
- self.server_stop()
+ try:
+ job.barrier(server_tag, 'start',
+ 30).rendevous(*all)
+ job.barrier(server_tag, 'stop',
+ 3600).rendevous(*all)
+ finally:
+ self.server_stop()
elif (role == 'client'):
os.environ['NETPERF_CMD'] = self.client_path
job.barrier(client_tag, 'start', 30).rendevous(*all)