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

[gnunet]

Author: wachs
Date: 2013-04-08 13:19:45 +0200 (Mon, 08 Apr 2013)
New Revision: 26806

Modified:
   gnunet/src/integration-tests/test_integration_clique_nat.py.in
Log:
fix


Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2013-04-08 11:17:59 UTC (rev 26805)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2013-04-08 11:19:45 UTC (rev 26806)
@@ -49,9 +49,34 @@
 
 
 def cleanup ():
-    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_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) 
+    retries = 10
+    path = os.path.join (tmp, "c_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):