X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2Ftest_integration_restart.py.in;h=49a9672280b10c383d67fe6558a48a08721453fe;hb=414d5e246154c82272e36a76d224661cf8e0428f;hp=aadfec5b97ea8aca164def602e757a18a4299aa1;hpb=ed7f7c16f1f620ba6ce571c9385b5c77620d8f91;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index aadfec5b9..49a967228 100755
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.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
@@ -47,15 +46,32 @@ testname = "test_integration_restart"
 verbose = False
 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)    
-
+    retries = 10
+    path = os.path.join (tmp, "c_bootstrap_server")  
+    test.p ("Removing " + path)      
+    while ((os.path.exists(path)) and (retries > 0)):
+        shutil.rmtree ((path), False)
+        time.sleep (1)
+        retries -= 1
+    if (os.path.exists(path)):
+        test.p ("Failed to remove " + path) 
+        
+    
+    retries = 10
+    path = os.path.join (tmp, "c_no_nat_client")  
+    test.p ("Removing " + path)      
+    while ((os.path.exists(path)) and (retries > 0)):
+        shutil.rmtree ((path), False)
+        time.sleep (1)
+        retries -= 1
+    if (os.path.exists(path)):
+        test.p ("Failed to remove " + path) 
 
 def success_restart_cont (check):
 	global success 
@@ -85,13 +101,13 @@ def success_connect_cont (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))  
 	
@@ -108,13 +124,13 @@ 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))  
 	
@@ -133,7 +149,7 @@ def run ():
 	success = False
 	
 	test = Test ('test_integration_disconnect', verbose)
-	
+	cleanup ()
 	server = Peer(test, './confs/c_bootstrap_server.conf');
 	server.start();