diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-08 09:45:29 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-08 09:45:29 +0000 |
commit | 5a889b04b4975e880fe5fd815b7c39f6e8dd9855 (patch) | |
tree | b8e98116505e40ced8119395bcceb908ba1e0e38 | |
parent | 6f3ff8ff3db35d2a5c02e8cc88a912e9e0106d7c (diff) | |
download | gnunet-5a889b04b4975e880fe5fd815b7c39f6e8dd9855.tar.gz gnunet-5a889b04b4975e880fe5fd815b7c39f6e8dd9855.zip |
fixed cleanup
-rwxr-xr-x | src/integration-tests/test_integration_bootstrap_and_connect.py.in | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index cd3bdbef8..b95ed3c57 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -57,9 +57,27 @@ else: | |||
57 | tmp = "/tmp" | 57 | tmp = "/tmp" |
58 | 58 | ||
59 | def cleanup (): | 59 | def cleanup (): |
60 | shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) | 60 | retries = 10 |
61 | shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) | 61 | path = os.path.join (tmp, "c_bootstrap_server") |
62 | 62 | test.p ("Removing " + path) | |
63 | while ((os.path.exists(path)) and (retries > 0)): | ||
64 | shutil.rmtree ((path), False) | ||
65 | time.sleep (1) | ||
66 | retries -= 1 | ||
67 | if (os.path.exists(path)): | ||
68 | test.p ("Failed to remove " + path) | ||
69 | |||
70 | |||
71 | retries = 10 | ||
72 | path = os.path.join (tmp, "c_no_nat_client") | ||
73 | test.p ("Removing " + path) | ||
74 | while ((os.path.exists(path)) and (retries > 0)): | ||
75 | shutil.rmtree ((path), False) | ||
76 | time.sleep (1) | ||
77 | retries -= 1 | ||
78 | if (os.path.exists(path)): | ||
79 | test.p ("Failed to remove " + path) | ||
80 | |||
63 | def success_cont (check): | 81 | def success_cont (check): |
64 | global success | 82 | global success |
65 | success = True; | 83 | success = True; |