[GNUnet-SVN] r30835 - gnunet/src/gns

[gnunet]

Author: wachs
Date: 2013-11-21 09:56:48 +0100 (Thu, 21 Nov 2013)
New Revision: 30835

Modified:
   gnunet/src/gns/test_gns_delegated_lookup.sh
   gnunet/src/gns/test_gns_dht_lookup.sh
   gnunet/src/gns/test_gns_ipv6_lookup.sh
   gnunet/src/gns/test_gns_lookup.sh
   gnunet/src/gns/test_gns_nick_shorten.sh
   gnunet/src/gns/test_gns_txt_lookup.sh
Log:
timeout is to short on slower systems (and when running with valgrind)


Modified: gnunet/src/gns/test_gns_delegated_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_delegated_lookup.sh 2013-11-21 08:16:18 UTC (rev 
30834)
+++ gnunet/src/gns/test_gns_delegated_lookup.sh 2013-11-21 08:56:48 UTC (rev 
30835)
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
 
 TEST_IP="127.0.0.1"

Modified: gnunet/src/gns/test_gns_dht_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_dht_lookup.sh       2013-11-21 08:16:18 UTC (rev 
30834)
+++ gnunet/src/gns/test_gns_dht_lookup.sh       2013-11-21 08:56:48 UTC (rev 
30835)
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf

Modified: gnunet/src/gns/test_gns_ipv6_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_ipv6_lookup.sh      2013-11-21 08:16:18 UTC (rev 
30834)
+++ gnunet/src/gns/test_gns_ipv6_lookup.sh      2013-11-21 08:56:48 UTC (rev 
30835)
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 TEST_IP="dead::beef"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C testego -c test_gns_lookup.conf

Modified: gnunet/src/gns/test_gns_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_lookup.sh   2013-11-21 08:16:18 UTC (rev 30834)
+++ gnunet/src/gns/test_gns_lookup.sh   2013-11-21 08:56:48 UTC (rev 30835)
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C testego -c test_gns_lookup.conf
@@ -13,7 +13,6 @@
 
 if [ "$RES_IP" == "$TEST_IP" ]
 then
-  echo "PASS: Resolved correct IP address, got $RES_IP"
   exit 0
 else
   echo "FAIL: Failed to resolve to proper IP, got $RES_IP."

Modified: gnunet/src/gns/test_gns_nick_shorten.sh
===================================================================
--- gnunet/src/gns/test_gns_nick_shorten.sh     2013-11-21 08:16:18 UTC (rev 
30834)
+++ gnunet/src/gns/test_gns_nick_shorten.sh     2013-11-21 08:56:48 UTC (rev 
30835)
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 
 # This test tests shortening functionality based on NICK records:
 # 

Modified: gnunet/src/gns/test_gns_txt_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_txt_lookup.sh       2013-11-21 08:16:18 UTC (rev 
30834)
+++ gnunet/src/gns/test_gns_txt_lookup.sh       2013-11-21 08:56:48 UTC (rev 
30835)
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 TEST_TXT="GNS powered txt record data"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C testego -c test_gns_lookup.conf
@@ -15,6 +15,6 @@
 then
   exit 0
 else
-  echo "Failed to resolve to proper TXT, got $RES_TXT."
+  echo "Failed to resolve to proper TXT, got '$RES_TXT'."
   exit 1
 fi