diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-18 11:32:49 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-18 11:32:49 +0000 |
commit | ea8c85c55b9df1b491713b79bb221b7476949742 (patch) | |
tree | 0eb46f89dd6bd8aa650cdb546ad509a75f06b340 /src/gns | |
parent | 89750cb0d154d0c82de41ff10c70d8e8d70e0c9f (diff) | |
download | gnunet-ea8c85c55b9df1b491713b79bb221b7476949742.tar.gz gnunet-ea8c85c55b9df1b491713b79bb221b7476949742.zip |
clean up test after execution
Diffstat (limited to 'src/gns')
-rwxr-xr-x | src/gns/test_gns_cname_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_delegated_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_dht_lookup.sh | 1 | ||||
-rwxr-xr-x | src/gns/test_gns_gns2dns_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_ipv6_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_mx_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_nick_shorten.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_plus_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_quickupdate.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_rel_expiration.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_revocation.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_soa_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_txt_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_zkey_lookup.sh | 3 |
14 files changed, 30 insertions, 14 deletions
diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh index 538861c0e..00614f038 100755 --- a/src/gns/test_gns_cname_lookup.sh +++ b/src/gns/test_gns_cname_lookup.sh | |||
@@ -13,7 +13,8 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | |||
17 | TEST_DOMAIN_PLUS="www.gnu" | 18 | TEST_DOMAIN_PLUS="www.gnu" |
18 | TEST_DOMAIN_DNS="www3.gnu" | 19 | TEST_DOMAIN_DNS="www3.gnu" |
19 | TEST_IP_PLUS="127.0.0.1" | 20 | TEST_IP_PLUS="127.0.0.1" |
@@ -40,6 +41,7 @@ gnunet-namestore -p -z testego -d -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RE | |||
40 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf | 41 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf |
41 | gnunet-identity -D testego -c test_gns_lookup.conf | 42 | gnunet-identity -D testego -c test_gns_lookup.conf |
42 | gnunet-arm -e -c test_gns_lookup.conf | 43 | gnunet-arm -e -c test_gns_lookup.conf |
44 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
43 | 45 | ||
44 | if [ "$RES_CNAME_RAW" == "server.$TESTEGOZONE.zkey" ] | 46 | if [ "$RES_CNAME_RAW" == "server.$TESTEGOZONE.zkey" ] |
45 | then | 47 | then |
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index 7f22a70b5..fc507444f 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 17 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | gnunet-arm -s -c test_gns_lookup.conf | 20 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -28,6 +28,8 @@ gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
29 | gnunet-arm -e -c test_gns_lookup.conf | 29 | gnunet-arm -e -c test_gns_lookup.conf |
30 | 30 | ||
31 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
32 | |||
31 | if [ "$RES_IP" == "$TEST_IP" ] | 33 | if [ "$RES_IP" == "$TEST_IP" ] |
32 | then | 34 | then |
33 | exit 0 | 35 | exit 0 |
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh index 39023b077..ce19fcdde 100755 --- a/src/gns/test_gns_dht_lookup.sh +++ b/src/gns/test_gns_dht_lookup.sh | |||
@@ -27,6 +27,7 @@ gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gn | |||
27 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` | 27 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` |
28 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
29 | gnunet-arm -e -c test_gns_lookup.conf | 29 | gnunet-arm -e -c test_gns_lookup.conf |
30 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
30 | 31 | ||
31 | if [ "$RES_IP" == "$TEST_IP" ] | 32 | if [ "$RES_IP" == "$TEST_IP" ] |
32 | then | 33 | then |
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh index 34ec1dc83..829161e6c 100755 --- a/src/gns/test_gns_gns2dns_lookup.sh +++ b/src/gns/test_gns_gns2dns_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -r rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | # IP address of 'uk.gnunet.org' | 17 | # IP address of 'uk.gnunet.org' |
18 | TEST_IP_ALT2="81.187.252.184" | 18 | TEST_IP_ALT2="81.187.252.184" |
19 | # IP address of 'www.gnunet.org' | 19 | # IP address of 'www.gnunet.org' |
@@ -64,6 +64,8 @@ gnunet-namestore -z testego -d -n $TEST_RESOLVER_LABEL -t A -V $TEST_IP_GNS2DNS | |||
64 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf | 64 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf |
65 | gnunet-identity -D testego -c test_gns_lookup.conf | 65 | gnunet-identity -D testego -c test_gns_lookup.conf |
66 | gnunet-arm -e -c test_gns_lookup.conf | 66 | gnunet-arm -e -c test_gns_lookup.conf |
67 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
68 | |||
67 | ret=0 | 69 | ret=0 |
68 | if [ "$RES_IP" == "$TEST_IP" ] | 70 | if [ "$RES_IP" == "$TEST_IP" ] |
69 | then | 71 | then |
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh index 71b7585b3..6b7733ce0 100755 --- a/src/gns/test_gns_ipv6_lookup.sh +++ b/src/gns/test_gns_ipv6_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -r `rm -rf /tmp/test-gnunet-gns-peer-1/` |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" |
18 | TEST_IP="dead::beef" | 18 | TEST_IP="dead::beef" |
19 | gnunet-arm -s -c test_gns_lookup.conf | 19 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -23,6 +23,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t AAAA -c test_gns_l | |||
23 | gnunet-namestore -z testego -d -n www -t AAAA -V $TEST_IP -e never -c test_gns_lookup.conf | 23 | gnunet-namestore -z testego -d -n www -t AAAA -V $TEST_IP -e never -c test_gns_lookup.conf |
24 | gnunet-identity -D testego -c test_gns_lookup.conf | 24 | gnunet-identity -D testego -c test_gns_lookup.conf |
25 | gnunet-arm -e -c test_gns_lookup.conf | 25 | gnunet-arm -e -c test_gns_lookup.conf |
26 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
26 | 27 | ||
27 | if [ "$RES_IP" == "$TEST_IP" ] | 28 | if [ "$RES_IP" == "$TEST_IP" ] |
28 | then | 29 | then |
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh index eca7316ff..e378bd1f7 100755 --- a/src/gns/test_gns_mx_lookup.sh +++ b/src/gns/test_gns_mx_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
18 | 18 | ||
19 | TEST_MX="5,mail.gnu" | 19 | TEST_MX="5,mail.gnu" |
@@ -25,6 +25,7 @@ RES_MX=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t MX -c test_gns_loo | |||
25 | gnunet-namestore -z testego -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf | 25 | gnunet-namestore -z testego -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf |
26 | gnunet-identity -D testego -c test_gns_lookup.conf | 26 | gnunet-identity -D testego -c test_gns_lookup.conf |
27 | gnunet-arm -e -c test_gns_lookup.conf | 27 | gnunet-arm -e -c test_gns_lookup.conf |
28 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
28 | 29 | ||
29 | if [ "$RES_MX" == "$TEST_MX" ] | 30 | if [ "$RES_MX" == "$TEST_MX" ] |
30 | then | 31 | then |
diff --git a/src/gns/test_gns_nick_shorten.sh b/src/gns/test_gns_nick_shorten.sh index fef80b4d0..68ee57a2b 100755 --- a/src/gns/test_gns_nick_shorten.sh +++ b/src/gns/test_gns_nick_shorten.sh | |||
@@ -21,7 +21,7 @@ fi | |||
21 | 21 | ||
22 | # Deleting home directory from previous runs | 22 | # Deleting home directory from previous runs |
23 | TEST_CONFIG="test_gns_nick_shorten.conf " | 23 | TEST_CONFIG="test_gns_nick_shorten.conf " |
24 | rm -rf `gnunet-config -c test_gns_nick_shorten.conf -s PATHS -o GNUNET_HOME -f` | 24 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
25 | TEST_IP="127.0.0.1" | 25 | TEST_IP="127.0.0.1" |
26 | TEST_IP="127.0.0.2" | 26 | TEST_IP="127.0.0.2" |
27 | TEST_NICK_EGO="ego" | 27 | TEST_NICK_EGO="ego" |
@@ -118,7 +118,7 @@ gnunet-identity -D -z delegatedego -c $TEST_CONFIG | |||
118 | gnunet-identity -D -z short-zone -c $TEST_CONFIG | 118 | gnunet-identity -D -z short-zone -c $TEST_CONFIG |
119 | 119 | ||
120 | gnunet-arm -e -c test_gns_nick_shorten.conf | 120 | gnunet-arm -e -c test_gns_nick_shorten.conf |
121 | rm -rf `gnunet-config -c test_gns_nick_shorten.conf -s PATHS -o GNUNET_HOME -f` | 121 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
122 | 122 | ||
123 | exit $RES | 123 | exit $RES |
124 | 124 | ||
diff --git a/src/gns/test_gns_plus_lookup.sh b/src/gns/test_gns_plus_lookup.sh index 91865b346..0cb687dfe 100755 --- a/src/gns/test_gns_plus_lookup.sh +++ b/src/gns/test_gns_plus_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | fi | 14 | fi |
15 | 15 | ||
16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
17 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 17 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | gnunet-arm -s -c test_gns_lookup.conf | 20 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -27,6 +27,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u b.gnu -t A -c test_gns_lookup | |||
27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
28 | gnunet-namestore -z delegatedego -d -n '+' -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z delegatedego -d -n '+' -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
29 | gnunet-arm -e -c test_gns_lookup.conf | 29 | gnunet-arm -e -c test_gns_lookup.conf |
30 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
30 | 31 | ||
31 | if [ "$RES_IP" == "$TEST_IP" ] | 32 | if [ "$RES_IP" == "$TEST_IP" ] |
32 | then | 33 | then |
diff --git a/src/gns/test_gns_quickupdate.sh b/src/gns/test_gns_quickupdate.sh index c53eab0f6..cb3b67db2 100755 --- a/src/gns/test_gns_quickupdate.sh +++ b/src/gns/test_gns_quickupdate.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
18 | TEST_IP="127.0.0.1" | 18 | TEST_IP="127.0.0.1" |
19 | gnunet-arm -s -c test_gns_lookup.conf | 19 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -45,6 +45,7 @@ gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
45 | gnunet-identity -D testego -c test_gns_lookup.conf | 45 | gnunet-identity -D testego -c test_gns_lookup.conf |
46 | gnunet-identity -D delegatedego -c test_gns_lookup.conf | 46 | gnunet-identity -D delegatedego -c test_gns_lookup.conf |
47 | gnunet-arm -e -c test_gns_lookup.conf | 47 | gnunet-arm -e -c test_gns_lookup.conf |
48 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
48 | 49 | ||
49 | if [ "$RES_IP" == "$TEST_IP" ] | 50 | if [ "$RES_IP" == "$TEST_IP" ] |
50 | then | 51 | then |
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/gns/test_gns_rel_expiration.sh index 1f46d3c30..91eb45b3f 100755 --- a/src/gns/test_gns_rel_expiration.sh +++ b/src/gns/test_gns_rel_expiration.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
18 | TEST_IP="127.0.0.1" | 18 | TEST_IP="127.0.0.1" |
19 | gnunet-arm -s -c test_gns_lookup.conf | 19 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -33,6 +33,7 @@ gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
33 | gnunet-identity -D testego -c test_gns_lookup.conf | 33 | gnunet-identity -D testego -c test_gns_lookup.conf |
34 | gnunet-identity -D delegatedego -c test_gns_lookup.conf | 34 | gnunet-identity -D delegatedego -c test_gns_lookup.conf |
35 | gnunet-arm -e -c test_gns_lookup.conf | 35 | gnunet-arm -e -c test_gns_lookup.conf |
36 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
36 | 37 | ||
37 | if [ "$RES_IP_EXP" == "$TEST_IP" ] | 38 | if [ "$RES_IP_EXP" == "$TEST_IP" ] |
38 | then | 39 | then |
diff --git a/src/gns/test_gns_revocation.sh b/src/gns/test_gns_revocation.sh index dd288e2d8..afb5803f5 100755 --- a/src/gns/test_gns_revocation.sh +++ b/src/gns/test_gns_revocation.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 17 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | gnunet-arm -s -c test_gns_lookup.conf | 20 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -29,6 +29,7 @@ RES_IP_REV=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gn | |||
29 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 29 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
30 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 30 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
31 | gnunet-arm -e -c test_gns_lookup.conf | 31 | gnunet-arm -e -c test_gns_lookup.conf |
32 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
32 | 33 | ||
33 | if [ "$RES_IP" != "$TEST_IP" ] | 34 | if [ "$RES_IP" != "$TEST_IP" ] |
34 | then | 35 | then |
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh index 8ea44b191..6983cccba 100755 --- a/src/gns/test_gns_soa_lookup.sh +++ b/src/gns/test_gns_soa_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | TEST_DOMAIN="homepage.gnu" | 17 | TEST_DOMAIN="homepage.gnu" |
18 | # some public DNS resolver we can use | 18 | # some public DNS resolver we can use |
19 | TEST_IP_GNS2DNS="184.172.157.218" | 19 | TEST_IP_GNS2DNS="184.172.157.218" |
@@ -33,6 +33,7 @@ RES_SOA=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c test_g | |||
33 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null | 33 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null |
34 | gnunet-identity -D testego -c test_gns_lookup.conf | 34 | gnunet-identity -D testego -c test_gns_lookup.conf |
35 | gnunet-arm -e -c test_gns_lookup.conf | 35 | gnunet-arm -e -c test_gns_lookup.conf |
36 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
36 | 37 | ||
37 | if [ "x$RES_SOA" != "x" ] | 38 | if [ "x$RES_SOA" != "x" ] |
38 | then | 39 | then |
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh index a025eb8be..426bf8d5a 100755 --- a/src/gns/test_gns_txt_lookup.sh +++ b/src/gns/test_gns_txt_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 16 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" |
18 | TEST_TXT="GNS powered txt record data" | 18 | TEST_TXT="GNS powered txt record data" |
19 | gnunet-arm -s -c test_gns_lookup.conf | 19 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -23,6 +23,7 @@ RES_TXT=`$DO_TIMEOUT gnunet-gns --raw -z testego -u testtxt.gnu -t TXT -c test_g | |||
23 | gnunet-namestore -z testego -d -n testtxt -t TXT -V "$TEST_TXT" -e never -c test_gns_lookup.conf | 23 | gnunet-namestore -z testego -d -n testtxt -t TXT -V "$TEST_TXT" -e never -c test_gns_lookup.conf |
24 | gnunet-identity -D testego -c test_gns_lookup.conf | 24 | gnunet-identity -D testego -c test_gns_lookup.conf |
25 | gnunet-arm -e -c test_gns_lookup.conf | 25 | gnunet-arm -e -c test_gns_lookup.conf |
26 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
26 | 27 | ||
27 | if [ "$RES_TXT" == "$TEST_TXT" ] | 28 | if [ "$RES_TXT" == "$TEST_TXT" ] |
28 | then | 29 | then |
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh index 619a9eb32..e5f47423a 100755 --- a/src/gns/test_gns_zkey_lookup.sh +++ b/src/gns/test_gns_zkey_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | 17 | rm -rf /tmp/test-gnunet-gns-peer-1/ |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | gnunet-arm -s -c test_gns_lookup.conf | 20 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -27,6 +27,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.${DELEGATED_PKEY}.zkey -t | |||
27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
29 | gnunet-arm -e -c test_gns_lookup.conf | 29 | gnunet-arm -e -c test_gns_lookup.conf |
30 | rm -rf /tmp/test-gnunet-gns-peer-1/ | ||
30 | 31 | ||
31 | if [ "$RES_IP" == "$TEST_IP" ] | 32 | if [ "$RES_IP" == "$TEST_IP" ] |
32 | then | 33 | then |