[GNUnet-SVN] r26801 - in gnunet/src/integration-tests: . confs hostkeys

[gnunet]

Author: wachs
Date: 2013-04-08 11:54:13 +0200 (Mon, 08 Apr 2013)
New Revision: 26801

Added:
   gnunet/src/integration-tests/hostkeys/c_bootstrap_server
   gnunet/src/integration-tests/hostkeys/c_nat_client
   gnunet/src/integration-tests/hostkeys/c_no_nat_client
Removed:
   gnunet/src/integration-tests/hostkeys/0000-hostkey
   gnunet/src/integration-tests/hostkeys/0001-hostkey
   gnunet/src/integration-tests/hostkeys/0002-hostkey
Modified:
   gnunet/src/integration-tests/Makefile.am
   gnunet/src/integration-tests/confs/c_bootstrap_server.conf
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/confs/c_no_nat_client.conf
   
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
Log:
 changes


Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2013-04-08 09:47:11 UTC (rev 
26800)
+++ gnunet/src/integration-tests/Makefile.am    2013-04-08 09:54:13 UTC (rev 
26801)
@@ -140,9 +140,9 @@
    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 \

Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-04-08 
09:47:11 UTC (rev 26800)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-04-08 
09:54:13 UTC (rev 26801)
@@ -6,7 +6,7 @@
 #HOSTKEY = hostkeys/0000-hostkey 
 
 [PEER]
-PRIVATE_KEY = hostkeys/0000-hostkey 
+PRIVATE_KEY = hostkeys/c_bootstrap_server
 
 [vpn]
 AUTOSTART = YES

Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2013-04-08 
09:47:11 UTC (rev 26800)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2013-04-08 
09:54:13 UTC (rev 26801)
@@ -2,8 +2,11 @@
 SERVICEHOME = /tmp/c_nat_client
 
 [gnunetd]
-HOSTKEY = hostkeys/0002-hostkey 
+#HOSTKEY = hostkeys/0002-hostkey 
 
+[PEER]
+PRIVATE_KEY = hostkeys/c_nat_client 
+
 [client]
 HOME = $SERVICEHOME
 

Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-04-08 
09:47:11 UTC (rev 26800)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-04-08 
09:54:13 UTC (rev 26801)
@@ -6,7 +6,7 @@
 #HOSTKEY = hostkeys/0001-hostkey 
 
 [PEER]
-PRIVATE_KEY = hostkeys/0001-hostkey 
+PRIVATE_KEY = hostkeys/c_no_nat_client
 
 [gns]
 AUTOSTART = NO

Deleted: gnunet/src/integration-tests/hostkeys/0000-hostkey
===================================================================
(Binary files differ)

Deleted: gnunet/src/integration-tests/hostkeys/0001-hostkey
===================================================================
(Binary files differ)

Deleted: gnunet/src/integration-tests/hostkeys/0002-hostkey
===================================================================
(Binary files differ)

Copied: gnunet/src/integration-tests/hostkeys/c_bootstrap_server (from rev 
26795, gnunet/src/integration-tests/hostkeys/0000-hostkey)
===================================================================
(Binary files differ)

Copied: gnunet/src/integration-tests/hostkeys/c_nat_client (from rev 26794, 
gnunet/src/integration-tests/hostkeys/0002-hostkey)
===================================================================
(Binary files differ)

Copied: gnunet/src/integration-tests/hostkeys/c_no_nat_client (from rev 26794, 
gnunet/src/integration-tests/hostkeys/0001-hostkey)
===================================================================
(Binary files differ)

Modified: 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
===================================================================
--- 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
        2013-04-08 09:47:11 UTC (rev 26800)
+++ 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
        2013-04-08 09:54:13 UTC (rev 26801)
@@ -57,8 +57,26 @@
   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