summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-04-08 09:56:13 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-04-08 09:56:13 +0000
commitc39ead5d532225f7adbb583f3603f87613adf464 (patch)
treef6ad43f288692790e218bca000d27bb4364b5a5b /src
parentf4f85f4858dd9abdcae52d1fb6d41cc8cc4bb7d8 (diff)
cleanup
Diffstat (limited to 'src')
-rwxr-xr-xsrc/integration-tests/test_integration_restart.py.in23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index b3d3ecd18..70d10be24 100755
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -52,9 +52,26 @@ 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)
def success_restart_cont (check):
global success