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

[gnunet]

Author: wachs
Date: 2011-12-16 17:12:20 +0100 (Fri, 16 Dec 2011)
New Revision: 18633

Modified:
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/gnunet_testing.py.in
   gnunet/src/integration-tests/test_integration_clique_nat.py.in
Log:
fix


Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2011-12-16 
14:49:27 UTC (rev 18632)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2011-12-16 
16:12:20 UTC (rev 18633)
@@ -274,7 +274,7 @@
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 OPTIONS = -b
-SERVERS = http://v9.gnunet.org:58080/
+SERVERS = http://localhost:8080/
 HTTP-PROXY = 
 
 [core]

Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-16 14:49:27 UTC 
(rev 18632)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-16 16:12:20 UTC 
(rev 18633)
@@ -217,7 +217,7 @@
         #server.expect ("stdout", re.compile (r""))
         test = server.read("stdout", 10240)
         if (test.find(str(value)) == -1): 
-            return value
+            return -1
         else:
             return value  
 

Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2011-12-16 14:49:27 UTC (rev 18632)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2011-12-16 16:12:20 UTC (rev 18633)
@@ -41,7 +41,7 @@
 
 #definitions
 testname = "test_integration_clique_nat"
-verbose = False
+verbose = True
 check_timeout = 120
 
 
@@ -110,6 +110,7 @@
 
 
 def success_connect_cont (check):  
+    check.eval(False)
     check_disconnect_server ()