fix memleak

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

diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index d055b69074a3fe0b923ec1b048f1f96023336feb..2a863f8b2773a3f5b6aa863c959aaa6fda12b41f 100755 (executable)
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.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
@@ -44,16 +43,16 @@ from gnunet_testing import *
 
 testname = "test_integration_disconnect"
 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_disconnect_cont (check):
@@ -64,7 +63,7 @@ def success_disconnect_cont (check):
 def fail_disconnect_cont (check):    
     global success 
     success = False;
-    check.eval(True)   
+    check.evaluate(True)   
   
 
 def check_disconnect ():
@@ -73,7 +72,7 @@ def check_disconnect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
   check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont)
@@ -86,24 +85,24 @@ 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',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_connect_cont, fail_connect_cont)
+  check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
 
 # 
 # Test execution