api changes

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

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 2c9a569f11a509fbbdcd1aac7a8291cfcbf8cf00..49a2c592c551346f2dd8edbc615ca8d201982d8e 100755 (executable)
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -42,7 +42,7 @@ from gnunet_testing import *
 
 testname = "test_integration_clique"
 verbose = True
-check_timeout = 120
+check_timeout = 30
 
 
 def cleanup ():
@@ -63,7 +63,7 @@ def success_cont (check):
 def fail_cont (check):    
     global success 
     success= False;
-    check.eval(True)        
+    check.evaluate(True)        
 
 
 def check_disconnect_client ():
@@ -87,7 +87,7 @@ def success_disconnect_server_cont (check):
 def fail_disconnect_server_cont (check):    
     global success 
     success= False;
-    check.eval(True)        
+    check.evaluate(True)        
 
         
 def check_disconnect_server ():
@@ -116,7 +116,7 @@ def success_connect_cont (check):
 def fail_connect_cont (check):    
     global success 
     success= False;
-    check.eval(True)
+    check.evaluate(True)
 
 
 def check_connect ():
@@ -145,11 +145,12 @@ def check_connect ():
 # Test execution
 # 
 def run ():
-    global test
-    global server
-    global client
-    global success
-    
+       global success
+       global test
+       global server
+       global client
+       global client2  
+       
        success = False
        
        test = Test ('test_integration_disconnect', verbose)
@@ -172,12 +173,12 @@ def run ():
        client2.stop ()
        
        cleanup ()
-
-    if (success == False):
-       print ('Test failed')
-       return False 
-    else:
-       return True
+       
+       if (success == False):
+               print ('Test failed')
+               return False 
+       else:
+               return True
 
     
 try:
@@ -188,6 +189,9 @@ except (KeyboardInterrupt, SystemExit):
     client.stop ()
     client2.stop ()
     cleanup ()
-sys.exit(success)      
+if (success == False):
+       sys.exit(1)   
+else:
+       sys.exit(0)