Discard large metadata items first

[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 38746544c5f6f839c5dc0b215c351e99ca440a14..cd3bdbef86f8dc06981f8b7e2e77608a7d9b9d83 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -24,7 +24,6 @@ import subprocess
 import re
 import shutil
 import time
-import pexpect
 from gnunet_testing import Peer
 from gnunet_testing import Test
 from gnunet_testing import Check
@@ -32,6 +31,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 
@@ -43,65 +49,86 @@ from gnunet_testing import *
 
 testname = "test_integration_bootstrap_and_connect"
 verbose = True
-success = False
-timeout = 100
+check_timeout = 180
 
+if os.name == "nt":
+  tmp = os.getenv ("TEMP")
+else:
+  tmp = "/tmp"
 
 def cleanup ():
-       if os.name == "nt":
-           shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
-           shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True)
-       else:
-           shutil.rmtree ("/tmp/c_bootstrap_server/", True)
-           shutil.rmtree ("/tmp/c_no_nat_client/", True)    
+    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True)
 
-def success ():
+def success_cont (check):
     global success
     success = True;
-def fail ():    
+    
+def fail_cont (check):    
     global success 
-    success= False;
+    success = False;
+    check.evaluate(True)
 
 def check ():
-  
-  check = Check ()
+  check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
-  check.run_blocking (10, success, fail)
+  check.run_blocking (check_timeout, success_cont, fail_cont)
 
 # 
 # Test execution
 # 
 
-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)):
-    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');
+       
+       assert (True == server.start());
+       assert (True == 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