From cc860cd0446b963f8ca0b6866bf0042b85d6fe2e Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 21 Nov 2013 08:56:48 +0000 Subject: [PATCH] timeout is to short on slower systems (and when running with valgrind) --- src/gns/test_gns_delegated_lookup.sh | 2 +- src/gns/test_gns_dht_lookup.sh | 2 +- src/gns/test_gns_ipv6_lookup.sh | 2 +- src/gns/test_gns_lookup.sh | 3 +-- src/gns/test_gns_nick_shorten.sh | 2 +- src/gns/test_gns_txt_lookup.sh | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index 04a46f834..43d72e823 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh @@ -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" diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh index 2ddeda7b1..7d76d9c52 100755 --- a/src/gns/test_gns_dht_lookup.sh +++ b/src/gns/test_gns_dht_lookup.sh @@ -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 diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh index 6dea58d49..21f7feb5b 100755 --- a/src/gns/test_gns_ipv6_lookup.sh +++ b/src/gns/test_gns_ipv6_lookup.sh @@ -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 diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh index f90fb7364..6eb16aa52 100755 --- a/src/gns/test_gns_lookup.sh +++ b/src/gns/test_gns_lookup.sh @@ -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 @@ gnunet-arm -e -c test_gns_lookup.conf 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." diff --git a/src/gns/test_gns_nick_shorten.sh b/src/gns/test_gns_nick_shorten.sh index 6085b320c..74a78c635 100755 --- a/src/gns/test_gns_nick_shorten.sh +++ b/src/gns/test_gns_nick_shorten.sh @@ -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: # diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh index 8d7e08f64..52251af50 100755 --- a/src/gns/test_gns_txt_lookup.sh +++ b/src/gns/test_gns_txt_lookup.sh @@ -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 @@ if [ "$RES_TXT" == "$TEST_TXT" ] 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 -- 2.25.1