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

[gnunet]

Author: wachs
Date: 2013-08-26 13:41:11 +0200 (Mon, 26 Aug 2013)
New Revision: 28861

Modified:
   gnunet/src/integration-tests/confs/c_bootstrap_server.conf
   gnunet/src/integration-tests/confs/c_no_nat_client.conf
   gnunet/src/integration-tests/hostkeys/c_bootstrap_server
   gnunet/src/integration-tests/hostkeys/c_no_nat_client
   gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
Log:
fixing integration tests


Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-08-26 
07:59:17 UTC (rev 28860)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-08-26 
11:41:11 UTC (rev 28861)
@@ -93,6 +93,8 @@
 CONFIG = ~/.my.cnf
 
 [peerinfo]
+# Do not load HELLOs shipped with GNUnet
+USE_INCLUDED_HELLOS = NO
 AUTOSTART = YES
 PORT = 20013
 HOSTNAME = localhost
@@ -299,9 +301,6 @@
 ENABLE_ICMP_SERVER = NO
 DISABLEV6 = YES
 RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
 
 [gnunet-nat-server]
 HOSTNAME = gnunet.org

Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-08-26 
07:59:17 UTC (rev 28860)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-08-26 
11:41:11 UTC (rev 28861)
@@ -99,6 +99,8 @@
 CONFIG = ~/.my.cnf
 
 [peerinfo]
+# Do not load HELLOs shipped with GNUnet
+USE_INCLUDED_HELLOS = NO
 AUTOSTART = YES
 PORT = 20031
 HOSTNAME = localhost
@@ -306,9 +308,6 @@
 ENABLE_ICMP_SERVER = NO
 DISABLEV6 = YES
 RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
 
 [gnunet-nat-server]
 HOSTNAME = gnunet.org

Modified: gnunet/src/integration-tests/hostkeys/c_bootstrap_server
===================================================================
(Binary files differ)

Modified: gnunet/src/integration-tests/hostkeys/c_no_nat_client
===================================================================
(Binary files differ)

Modified: 
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-08-26 07:59:17 UTC (rev 28860)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in   
2013-08-26 11:41:11 UTC (rev 28861)
@@ -48,7 +48,7 @@
 #definitions
 
 testname = "test_integration_bootstrap_and_connect"
-verbose = False
+verbose = Verbose
 check_timeout = 180
 
 if os.name == "nt":