X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2Ftest_integration_clique.py.in;h=6c7a5d770e9c0a1dd4e1ffd16192e6457309ce6b;hb=d0b4927e6ab7e8b9874dd7807055e77fb4c5163f;hp=ce254ca7b43efa8d9787283fdeeaba4d6744eb17;hpb=ac01064f2f336b9903164e11450bb46d4c5c04ad;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index ce254ca7b..6c7a5d770 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -30,30 +30,28 @@ 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
 from gnunet_testing import Condition
 from gnunet_testing import * 
  
+if os.name == "nt":
+  tmp = os.getenv ("TEMP")
+else:
+  tmp = "/tmp"
 
 #definitions
 
 testname = "test_integration_clique"
 verbose = True
-check_timeout = 120
+check_timeout = 180
 
 
 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)
-	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client_2"), True)
-	else:
-	    shutil.rmtree ("/tmp/c_bootstrap_server/", True)
-	    shutil.rmtree ("/tmp/c_no_nat_client/", True)
-	    shutil.rmtree ("/tmp/c_no_nat_client_2/", True)
+    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True)
 
 
 def success_cont (check):
@@ -63,7 +61,7 @@ def success_cont (check):
 def fail_cont (check):    
     global success 
     success= False;
-    check.eval(True)        
+    check.evaluate(True)        
 
 
 def check_disconnect_client ():
@@ -73,7 +71,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -87,7 +85,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 ():
@@ -96,13 +94,13 @@ def check_disconnect_server ():
   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 (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -116,26 +114,26 @@ def success_connect_cont (check):
 def fail_connect_cont (check):    
     global success 
     success= False;
-    check.eval(True)
+    check.evaluate(True)
 
 
 def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   
@@ -144,33 +142,54 @@ def check_connect ():
 # 
 # Test execution
 # 
+def run ():
+	global success
+	global test
+	global server
+	global client
+	global client2	
+	
+	success = False
+	
+	test = Test ('test_integration_disconnect', verbose)
+	
+	server = Peer(test, './confs/c_bootstrap_server.conf');
+	server.start();
+	
+	client = Peer(test, './confs/c_no_nat_client.conf');
+	client.start();
+	
+	client2 = Peer(test, './confs/c_no_nat_client_2.conf');
+	client2.start();
+	
+	if ((client.started == True) and (client2.started == True) and (server.started == True)):
+	    test.p ('Peers started, running check')
+	    check_connect ()
+	    
+	server.stop ()    
+	client.stop ()
+	client2.stop ()
+	
+	cleanup ()
+	
+	if (success == False):
+		print ('Test failed')
+		return False 
+	else:
+		return True
 
-success = False
-
-test = Test ('test_integration_disconnect', verbose)
-
-server = Peer(test, './confs/c_bootstrap_server.conf');
-server.start();
-
-client = Peer(test, './confs/c_no_nat_client.conf');
-client.start();
-
-client2 = Peer(test, './confs/c_no_nat_client_2.conf');
-client2.start();
-
-if ((client.started == True) and (client2.started == True) and (server.started == True)):
-    test.p ('Peers started, running check')
-    check_connect ()
     
-server.stop ()    
-client.stop ()
-client2.stop ()
-
-cleanup ()
-
+try:
+    run ()
+except (KeyboardInterrupt, SystemExit):    
+    print 'Test interrupted'
+    server.stop ()
+    client.stop ()
+    client2.stop ()
+    cleanup ()
 if (success == False):
-    print ('Test failed')
-    exit (1)
+	sys.exit(1)   
 else:
-    exit (0)
+	sys.exit(0)    
+