[GNUnet-SVN] r31472 - gnunet/src/integration-tests

[gnunet]

Author: wachs
Date: 2013-12-17 10:36:58 +0100 (Tue, 17 Dec 2013)
New Revision: 31472

Modified:
   gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
Log:
if start fails, clean up and exit


Modified: 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-12-17 09:29:12 UTC (rev 31471)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-12-17 09:36:58 UTC (rev 31472)
@@ -144,8 +144,22 @@
        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')