aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-12-16 16:12:20 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-12-16 16:12:20 +0000
commit82f771a0779a45d69a6ae2789f10eef2a2a832b1 (patch)
tree360aa9fdddaa4def05b23e8337b4eefb33164e6d
parent552cdae90b8f2da2c38689a39636452c19205919 (diff)
downloadgnunet-82f771a0779a45d69a6ae2789f10eef2a2a832b1.tar.gz
gnunet-82f771a0779a45d69a6ae2789f10eef2a2a832b1.zip
fix
-rw-r--r--src/integration-tests/confs/c_nat_client.conf2
-rw-r--r--src/integration-tests/gnunet_testing.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_clique_nat.py.in3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index d23c4d57b..27e041ca7 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -274,7 +274,7 @@ HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274CONFIG = $DEFAULTCONFIG 274CONFIG = $DEFAULTCONFIG
275BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
276OPTIONS = -b 276OPTIONS = -b
277SERVERS = http://v9.gnunet.org:58080/ 277SERVERS = http://localhost:8080/
278HTTP-PROXY = 278HTTP-PROXY =
279 279
280[core] 280[core]
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 81dff3f06..d53aa1592 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -217,7 +217,7 @@ class Peer:
217 #server.expect ("stdout", re.compile (r"")) 217 #server.expect ("stdout", re.compile (r""))
218 test = server.read("stdout", 10240) 218 test = server.read("stdout", 10240)
219 if (test.find(str(value)) == -1): 219 if (test.find(str(value)) == -1):
220 return value 220 return -1
221 else: 221 else:
222 return value 222 return value
223 223
diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in
index 6e6d4e505..c8e9afefa 100755
--- a/src/integration-tests/test_integration_clique_nat.py.in
+++ b/src/integration-tests/test_integration_clique_nat.py.in
@@ -41,7 +41,7 @@ from gnunet_testing import *
41 41
42#definitions 42#definitions
43testname = "test_integration_clique_nat" 43testname = "test_integration_clique_nat"
44verbose = False 44verbose = True
45check_timeout = 120 45check_timeout = 120
46 46
47 47
@@ -110,6 +110,7 @@ def check_disconnect_server ():
110 110
111 111
112def success_connect_cont (check): 112def success_connect_cont (check):
113 check.eval(False)
113 check_disconnect_server () 114 check_disconnect_server ()
114 115
115 116