diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-05-07 09:44:56 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-05-07 09:44:56 +0000 |
commit | e8fa3dbf6a3368a79b640c7d7229e42cc3318c9d (patch) | |
tree | 5325a4a1ad1c4ddff210909c6464b3ba1bc29bc5 /src/dht | |
parent | 3d6353b9601e966a7aedd294beb8b78363911bb2 (diff) | |
download | gnunet-e8fa3dbf6a3368a79b640c7d7229e42cc3318c9d.tar.gz gnunet-e8fa3dbf6a3368a79b640c7d7229e42cc3318c9d.zip |
fix for failure of dht testcase due to long wait for hostkey generation. testcase now uses gnunet-peerinfo to generate the hostkey first, then runs gnunet. A much better fix would be to have services that need a hostkey not report to arm that they are happily running when they may hang indefinitely trying to generate or retrieve a hostkey. Or if most things really need a hostkey have gnunet-service-arm generate the damned thing BEFORE starting services.
Diffstat (limited to 'src/dht')
-rwxr-xr-x | src/dht/test_dht_tools.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh index 0154d99c7..cbbbfd639 100755 --- a/src/dht/test_dht_tools.sh +++ b/src/dht/test_dht_tools.sh | |||
@@ -6,7 +6,7 @@ checkout="check.out" | |||
6 | armexe="gnunet-arm -c $tempcfg " | 6 | armexe="gnunet-arm -c $tempcfg " |
7 | putexe="gnunet-dht-put -c $tempcfg " | 7 | putexe="gnunet-dht-put -c $tempcfg " |
8 | getexe="gnunet-dht-get -c $tempcfg " | 8 | getexe="gnunet-dht-get -c $tempcfg " |
9 | 9 | peerinfo="gnunet-peerinfo -c $tempcfg -sq" | |
10 | stop_arm() | 10 | stop_arm() |
11 | { | 11 | { |
12 | if ! $armexe $DEBUG -e -d > $out ; then | 12 | if ! $armexe $DEBUG -e -d > $out ; then |
@@ -19,6 +19,14 @@ stop_arm() | |||
19 | 19 | ||
20 | cp test_dht_api_peer1.conf $tempcfg | 20 | cp test_dht_api_peer1.conf $tempcfg |
21 | 21 | ||
22 | echo -n "TEST: Generating hostkey..." | ||
23 | if ! $peerinfo > $out ; then | ||
24 | echo "FAIL: error running $peerinfo" | ||
25 | echo "Command output was:" | ||
26 | cat $out | ||
27 | exit 1 | ||
28 | fi | ||
29 | |||
22 | echo -n "TEST: Starting ARM..." | 30 | echo -n "TEST: Starting ARM..." |
23 | if ! $armexe $DEBUG -s > $out ; then | 31 | if ! $armexe $DEBUG -s > $out ; then |
24 | echo "FAIL: error running $armexe" | 32 | echo "FAIL: error running $armexe" |