-patch from #1972 to display disconnects instead of exiting

[oweals/gnunet.git] / src / integration-tests / test_integration_bootstrap_and_connect.py.in

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 581179f9934ccdd074289ecf0951dfdb02e8db86..7738c72d88a735fe0b957538e91b2955202f145d 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -32,6 +32,13 @@ from gnunet_testing import Condition
 from gnunet_testing import * 
  
 
+#
+# This test tests if a fresh peer bootstraps from a hostlist server and then
+# successfully connects to the server 
+#
+# Conditions for successful exit:
+# Both peers have 1 connected peer in transport, core, topology, fs
+
 #
 # This test tests if a fresh peer bootstraps from a hostlist server and then
 # successfully connects to the server 
@@ -42,8 +49,8 @@ from gnunet_testing import *
 #definitions
 
 testname = "test_integration_bootstrap_and_connect"
-verbose = False
-timeout = 100
+verbose = True
+check_timeout = 30
 
 
 def cleanup ():
@@ -60,11 +67,10 @@ def success_cont (check):
     
 def fail_cont (check):    
     global success 
-    success= False;
+    success = False;
     check.eval(True)
 
 def check ():
-  
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
@@ -79,32 +85,51 @@ def check ():
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
-  check.run_blocking (10, success_cont, fail_cont)
+  check.run_blocking (check_timeout, success_cont, fail_cont)
 
 # 
 # Test execution
 # 
-success = False
-
-test = Test ('test_integration_bootstrap_and_connect.py', verbose)
 
-server = Peer(test, './confs/c_bootstrap_server.conf');
-server.start();
-
-client = Peer(test, './confs/c_no_nat_client.conf');
-client.start();
-
-if ((client.started == True) and (server.started == True)):
-    test.p ('Peers started, running check')
-    check ()
+def run ():
+       global success
+       global test
+       global server
+       global client    
        
-server.stop ()
-client.stop ()
-
-cleanup ()
+       success = False  
+       test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+       
+       server = Peer(test, './confs/c_bootstrap_server.conf');
+       client = Peer(test, './confs/c_no_nat_client.conf');
+       
+       server.start();
+       client.start();
+       
+       if ((client.started == True) and (server.started == True)):
+           test.p ('Peers started, running check')
+           time.sleep(5)
+           check ()
+       server.stop ()
+       client.stop ()
+       
+       cleanup ()
+       
+       if (success == False):
+               print ('Test failed')
+               return False 
+       else:
+               return True
 
+try:
+    run ()
+except (KeyboardInterrupt, SystemExit):    
+    print 'Test interrupted'
+    server.stop ()
+    client.stop ()
+    cleanup ()
 if (success == False):
-       print ('Test failed')
-       exit (1)
+       sys.exit(1)   
 else:
-       exit (0)
+       sys.exit(0)    
+    
\ No newline at end of file