aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-08-26 11:41:11 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-08-26 11:41:11 +0000
commit8f64046bf642054997b604105a8ff48859f6fb15 (patch)
tree8bdf614eeb0d2d796f25156313d19e6b033ae090 /src/integration-tests
parent186af322929304aab1bfb97a371ac05d19b73d3e (diff)
downloadgnunet-8f64046bf642054997b604105a8ff48859f6fb15.tar.gz
gnunet-8f64046bf642054997b604105a8ff48859f6fb15.zip
fixing integration tests
Diffstat (limited to 'src/integration-tests')
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf5
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf5
-rw-r--r--src/integration-tests/hostkeys/c_bootstrap_serverbin827 -> 32 bytes
-rw-r--r--src/integration-tests/hostkeys/c_no_nat_clientbin827 -> 32 bytes
-rwxr-xr-xsrc/integration-tests/test_integration_bootstrap_and_connect.py.in2
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
93CONFIG = ~/.my.cnf 93CONFIG = ~/.my.cnf
94 94
95[peerinfo] 95[peerinfo]
96# Do not load HELLOs shipped with GNUnet
97USE_INCLUDED_HELLOS = NO
96AUTOSTART = YES 98AUTOSTART = YES
97PORT = 20013 99PORT = 20013
98HOSTNAME = localhost 100HOSTNAME = localhost
@@ -299,9 +301,6 @@ ENABLE_ICMP_CLIENT = NO
299ENABLE_ICMP_SERVER = NO 301ENABLE_ICMP_SERVER = NO
300DISABLEV6 = YES 302DISABLEV6 = YES
301RETURN_LOCAL_ADDRESSES = NO 303RETURN_LOCAL_ADDRESSES = NO
302HOSTNAME_DNS_FREQUENCY = 1200000
303IFC_SCAN_FREQUENCY = 3000000
304DYNDNS_FREQUENCY = 140000
305 304
306[gnunet-nat-server] 305[gnunet-nat-server]
307HOSTNAME = gnunet.org 306HOSTNAME = 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
99CONFIG = ~/.my.cnf 99CONFIG = ~/.my.cnf
100 100
101[peerinfo] 101[peerinfo]
102# Do not load HELLOs shipped with GNUnet
103USE_INCLUDED_HELLOS = NO
102AUTOSTART = YES 104AUTOSTART = YES
103PORT = 20031 105PORT = 20031
104HOSTNAME = localhost 106HOSTNAME = localhost
@@ -306,9 +308,6 @@ ENABLE_ICMP_CLIENT = NO
306ENABLE_ICMP_SERVER = NO 308ENABLE_ICMP_SERVER = NO
307DISABLEV6 = YES 309DISABLEV6 = YES
308RETURN_LOCAL_ADDRESSES = NO 310RETURN_LOCAL_ADDRESSES = NO
309HOSTNAME_DNS_FREQUENCY = 1200000
310IFC_SCAN_FREQUENCY = 3000000
311DYNDNS_FREQUENCY = 140000
312 311
313[gnunet-nat-server] 312[gnunet-nat-server]
314HOSTNAME = gnunet.org 313HOSTNAME = gnunet.org
diff --git a/src/integration-tests/hostkeys/c_bootstrap_server b/src/integration-tests/hostkeys/c_bootstrap_server
index ecc2df216..caec765bc 100644
--- a/src/integration-tests/hostkeys/c_bootstrap_server
+++ b/src/integration-tests/hostkeys/c_bootstrap_server
Binary files differ
diff --git a/src/integration-tests/hostkeys/c_no_nat_client b/src/integration-tests/hostkeys/c_no_nat_client
index b6c904ca4..1db6b4d2d 100644
--- a/src/integration-tests/hostkeys/c_no_nat_client
+++ b/src/integration-tests/hostkeys/c_no_nat_client
Binary files differ
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 *
48#definitions 48#definitions
49 49
50testname = "test_integration_bootstrap_and_connect" 50testname = "test_integration_bootstrap_and_connect"
51verbose = False 51verbose = Verbose
52check_timeout = 180 52check_timeout = 180
53 53
54if os.name == "nt": 54if os.name == "nt":