changes

8 files changed, 29 insertions, 8 deletions

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 1cce8ab1d..72a2fa9df 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -140,9 +140,9 @@ EXTRA_DIST = \
    confs/c_no_nat_client_http_2.conf \
    confs/c_no_nat_client_unix.conf \
    confs/c_no_nat_client_unix_2.conf \
-   hostkeys/0000-hostkey \
-   hostkeys/0001-hostkey \
-   hostkeys/0002-hostkey \
+   hostkeys/c_bootstrap_server \
+   hostkeys/c_no_nat_client \
+   hostkeys/c_nat_client \
    hostkeys/0003-hostkey \
    hostkeys/0004-hostkey \
    hostkeys/0005-hostkey \
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 0dcb842cd..332cf4828 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -6,7 +6,7 @@ SERVICEHOME = /tmp/c_bootstrap_server/
 #HOSTKEY = hostkeys/0000-hostkey 
 
 [PEER]
-PRIVATE_KEY = hostkeys/0000-hostkey 
+PRIVATE_KEY = hostkeys/c_bootstrap_server
 
 [vpn]
 AUTOSTART = YES
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 130d4398d..3021d76ad 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -2,7 +2,10 @@
 SERVICEHOME = /tmp/c_nat_client
 
 [gnunetd]
-HOSTKEY = hostkeys/0002-hostkey 
+#HOSTKEY = hostkeys/0002-hostkey 
+
+[PEER]
+PRIVATE_KEY = hostkeys/c_nat_client 
 
 [client]
 HOME = $SERVICEHOME
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index be186182c..87fef4d4f 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,7 +6,7 @@ SERVICEHOME = /tmp/c_no_nat_client/
 #HOSTKEY = hostkeys/0001-hostkey 
 
 [PEER]
-PRIVATE_KEY = hostkeys/0001-hostkey 
+PRIVATE_KEY = hostkeys/c_no_nat_client
 
 [gns]
 AUTOSTART = NO
diff --git a/src/integration-tests/hostkeys/0000-hostkey b/src/integration-tests/hostkeys/c_bootstrap_server
index ecc2df216..ecc2df216 100644
--- a/src/integration-tests/hostkeys/0000-hostkey
+++ b/src/integration-tests/hostkeys/c_bootstrap_server
diff --git a/src/integration-tests/hostkeys/0002-hostkey b/src/integration-tests/hostkeys/c_nat_client
index e70fa3fab..e70fa3fab 100644
--- a/src/integration-tests/hostkeys/0002-hostkey
+++ b/src/integration-tests/hostkeys/c_nat_client
diff --git a/src/integration-tests/hostkeys/0001-hostkey b/src/integration-tests/hostkeys/c_no_nat_client
index b6c904ca4..b6c904ca4 100644
--- a/src/integration-tests/hostkeys/0001-hostkey
+++ b/src/integration-tests/hostkeys/c_no_nat_client
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
index 55982c2e4..6fd18f5c2 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
@@ -57,8 +57,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_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_server_stop_cont (check):
     global success