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

[gnunet]

Author: wachs
Date: 2013-04-08 11:56:13 +0200 (Mon, 08 Apr 2013)
New Revision: 26802

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


Modified: gnunet/src/integration-tests/test_integration_restart.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_restart.py.in 2013-04-08 
09:54:13 UTC (rev 26801)
+++ gnunet/src/integration-tests/test_integration_restart.py.in 2013-04-08 
09:56:13 UTC (rev 26802)
@@ -52,10 +52,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_restart_cont (check):
        global success 
        test.p ('Shutting down client & server')