if start fails, clean up and exit

1 files changed, 16 insertions, 2 deletions

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index afc55ca40a..cb0359e1f7 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -144,8 +144,22 @@ def run ():
 	server = Peer(test, './confs/c_bootstrap_server.conf');
 	client = Peer(test, './confs/c_no_nat_client.conf');
 	
-	assert (True == server.start());
-	assert (True == client.start());
+	if (True != server.start()):
+		print 'Failed to start server'
+		if (None != server):
+			server.stop ()
+		if (None != server):		
+			client.stop ()
+		cleanup ()
+		sys.exit(success)
+	if (True != client.start()):
+		print 'Failed to start client'
+		if (None != server):
+			server.stop ()
+		if (None != server):		
+			client.stop ()
+		cleanup ()
+		sys.exit(success)
 	
 	if ((client.started == True) and (server.started == True)):
 		test.p ('Peers started, running check')