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 a8aff73d773c87851fa1d14507f9f055a3feedf1..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
@@ -50,16 +49,16 @@ from gnunet_testing import *
 
 testname = "test_integration_bootstrap_and_connect"
 verbose = True
-check_timeout = 30
+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_cont (check):
     global success
@@ -67,25 +66,21 @@ def success_cont (check):
     
 def fail_cont (check):    
     global success 
-    success= False;
-    check.eval(True)
+    success = False;
+    check.evaluate(True)
 
 def check ():
-  global test
-  global server
-  global client
-  global success
   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))  
   
@@ -96,43 +91,44 @@ def check ():
 # 
 
 def run ():
-    global test
-    global server
-    global client
-    global success
-    
-    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 ()
-       
-    print 'stop in run'
-    server.stop ()
-    client.stop ()
-    
-    cleanup ()
-    
-    if (success == False):
-       print ('Test failed')
-       return False 
-    else:
-       return True
+       global success
+       global test
+       global server
+       global client    
+       
+       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 ()
+       run ()
 except (KeyboardInterrupt, SystemExit):    
-    print 'Test interrupted'
-    server.stop ()
-    client.stop ()
-    cleanup ()
-sys.exit(success)    
+       print 'Test interrupted'
+       server.stop ()
+       client.stop ()
+       cleanup ()
+if (success == False):
+       sys.exit(1)   
+else:
+       sys.exit(0)    
     
\ No newline at end of file