[GNUnet-SVN] r26799 - gnunet/src/integration-tests

[gnunet]

Author: wachs
Date: 2013-04-08 11:45:29 +0200 (Mon, 08 Apr 2013)
New Revision: 26799

Modified:
   gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
Log:
fixed cleanup


Modified: 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-04-08 09:31:53 UTC (rev 26798)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-04-08 09:45:29 UTC (rev 26799)
@@ -57,9 +57,27 @@
   tmp = "/tmp"
 
 def cleanup ():
-    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
-    shutil.rmtree (os.path.join (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_cont (check):
     global success
     success = True;