summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-04-08 11:21:43 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-04-08 11:21:43 +0000
commit337dd957e110bc530f7d2898d42617a4289b4d8b (patch)
tree4638ba4a9e38ce7e7d9b50c3df8b82ad0a74c068 /src
parentb7dbf9057993982020320b8015180928a0a8ebee (diff)
fix
Diffstat (limited to 'src')
-rwxr-xr-xsrc/integration-tests/test_integration_connect_on_restart.py.in31
1 files changed, 29 insertions, 2 deletions
diff --git a/src/integration-tests/test_integration_connect_on_restart.py.in b/src/integration-tests/test_integration_connect_on_restart.py.in
index 0b23c8fe8..21d9f26b8 100755
--- a/src/integration-tests/test_integration_connect_on_restart.py.in
+++ b/src/integration-tests/test_integration_connect_on_restart.py.in
@@ -51,8 +51,35 @@ else:
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)
+
+ retries = 10
+ path = os.path.join (tmp, "c_no_nat_client_2")
+ 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)
shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True)