From 8f64046bf642054997b604105a8ff48859f6fb15 Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 26 Aug 2013 11:41:11 +0000
Subject: [PATCH] fixing integration tests

---
 .../confs/c_bootstrap_server.conf                |   5 ++---
 src/integration-tests/confs/c_no_nat_client.conf |   5 ++---
 .../hostkeys/c_bootstrap_server                  | Bin 827 -> 32 bytes
 src/integration-tests/hostkeys/c_no_nat_client   | Bin 827 -> 32 bytes
 .../test_integration_bootstrap_and_connect.py.in |   2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 332cf4828..c84181409 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -93,6 +93,8 @@ DATABASE = gnunet
 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_CLIENT = NO
 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
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 87fef4d4f..be3d1b336 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -99,6 +99,8 @@ DATABASE = gnunet
 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_CLIENT = NO
 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
diff --git a/src/integration-tests/hostkeys/c_bootstrap_server b/src/integration-tests/hostkeys/c_bootstrap_server
index ecc2df216f3ead3085af1260523ba1ca17831ccc..caec765bc340ce7019f12551381b117dee9c78e1 100644
GIT binary patch
literal 32
qcmV+*0N?-TNiq;Dx`Ybyq#Y%=;TUp9U0RF%17GLW)o$VV!|CVop%FCz

literal 827
zcmZR!*08Y3POa2UNi0d^QqV9ouqr4`%E?UD1qyO0C}@~kr6#8o1Eqj$L#qN~V=IRL
zK)}GjzzD=}01|@%O{n5TA{76DDNZsrvWhxpdSjK<<ma1T?+q=R(Y7a5mTkkC;0@ob
z&)L|iUrO+XsZBRCwPMK@zxe5)j+6V3J<pydFLC%(&RpB5``UQHmxY$DH)b4~=Kt8~
z(LbsB*?rGnd)4sI6VpCt9G-0$ckc8yhYa)mfnQ;U<srEe>@|=#_B{KwcDeYxmd`s+
z9r}~38VFNd2(tO-o=2Rqn+~!|ttqZO>8fyPeMqOmtP+)<4PQ4iFRZ+szhK+%zug`t
zi#_f#o={&Qo9%kc<iy==caBuPi>ol7x&AK1FjK4K(xS3dV1WC128SpF=o*=tfn`7h
z5Nj9$gS#lREU_eYG%jcy7lu|Tpj6P?v(o5I-mwpBYM)G<Sp3W3c5iV+qrw-XX1gtO
Nd#b-rLXI9yE&zWuVrBpU

diff --git a/src/integration-tests/hostkeys/c_no_nat_client b/src/integration-tests/hostkeys/c_no_nat_client
index b6c904ca49b9bc995535c0980bc125321d055556..1db6b4d2d91054e6093491c95623ec170daa9d35 100644
GIT binary patch
literal 32
ocmX@;*3TvGq?o|%m4C|YM*54WuDzM@-}kGrmB{5YecLDi0M%CwYXATM

literal 827
zcmZR!*08Y3POa2UNi0d^QqV9ouqr4`%E?UD1qyO0C}@~kr6#8o1Eqj$L#qN~V=IRL
zK)}GjzzD=}01|@%O{n5TA{76DDNZsrvWhxpdSjK<<ma1T?+q=R(Y7a5mTkkC;0@ob
z&)L|iUrO+XsZBRCwPMK@zxe5)j+6V3J<pydFLC%(&RpB5``UQHmxY$DH)b4~=Kt8~
z(LbsB*?rGnd)4sI6VpCt9G-0$ckc8yhYa)mfnQ;U<srEe>@|=#_B{KwcDeYxmd`s+
z9r}~38VFNd2(nq-sQXPpWuXvLgip}TXAde)sMT~`d;96ml5>AAeY#b5$zSQZ&TQQ?
zc15f5&n&F`8zxz{RZizIPp++{&X4uwaWxRbOs$eji^@`g0q*A+9HJ1QYh-E$mH`n!
ztYHWY?xM`H#FEs}xS(-d7+R%(Qo)tP3m4Za|GD{e%3HCFQ%)~VZMIz4AkF*M-Ba|*
Nl21vQ$kC(81pwWhU_Sr=

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 0932f3c6a..db4f19f17 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -48,7 +48,7 @@ from gnunet_testing import *
 #definitions
 
 testname = "test_integration_bootstrap_and_connect"
-verbose = False
+verbose = Verbose
 check_timeout = 180
 
 if os.name == "nt":
-- 
2.25.1