aboutsummaryrefslogtreecommitdiff
path: root/src/reclaim
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2020-12-30 20:59:35 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2020-12-30 20:59:35 +0900
commitcc780f66a4fe096704ab264dce2c6b15b1cf50c5 (patch)
treea291d7b1246bf6b6bccd3e0c76b32fab058266ff /src/reclaim
parentc0465ff926f1b87a375ff320d367cbbabfddb38f (diff)
parent1f489833705ee9fc66686ed3045cc5dba56dfd39 (diff)
downloadgnunet-cc780f66a4fe096704ab264dce2c6b15b1cf50c5.tar.gz
gnunet-cc780f66a4fe096704ab264dce2c6b15b1cf50c5.zip
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/reclaim')
-rwxr-xr-xsrc/reclaim/test_reclaim_consume.sh6
-rwxr-xr-xsrc/reclaim/test_reclaim_issue.sh2
-rwxr-xr-xsrc/reclaim/test_reclaim_revoke.sh10
3 files changed, 9 insertions, 9 deletions
diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh
index 55f6ff22c..9186d3cb1 100755
--- a/src/reclaim/test_reclaim_consume.sh
+++ b/src/reclaim/test_reclaim_consume.sh
@@ -6,7 +6,7 @@ if [ -z $LOCATION ]
6then 6then
7 LOCATION="gnunet-config" 7 LOCATION="gnunet-config"
8fi 8fi
9$LOCATION --version 1> /dev/null 9$LOCATION --version 1>/dev/null
10if test $? != 0 10if test $? != 0
11then 11then
12 echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 12 echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
20# (3) PKEY3.user -> PKEY4 20# (3) PKEY3.user -> PKEY4
21 21
22 22
23which timeout &> /dev/null && DO_TIMEOUT="timeout 30" 23which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
24 24
25TEST_ATTR="test" 25TEST_ATTR="test"
26gnunet-arm -s -c test_reclaim.conf 26gnunet-arm -s -c test_reclaim.conf
@@ -32,7 +32,7 @@ TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
32gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf 32gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
33gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf 33gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
34TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') 34TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}')
35gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf > /dev/null 2>&1 35gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf >/dev/null 2>&1
36 36
37if test $? != 0 37if test $? != 0
38then 38then
diff --git a/src/reclaim/test_reclaim_issue.sh b/src/reclaim/test_reclaim_issue.sh
index 7ab8a6980..cfddc9407 100755
--- a/src/reclaim/test_reclaim_issue.sh
+++ b/src/reclaim/test_reclaim_issue.sh
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
20# (3) PKEY3.user -> PKEY4 20# (3) PKEY3.user -> PKEY4
21 21
22 22
23which timeout &> /dev/null && DO_TIMEOUT="timeout 30" 23which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
24 24
25TEST_ATTR="test" 25TEST_ATTR="test"
26gnunet-arm -s -c test_reclaim.conf 26gnunet-arm -s -c test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/reclaim/test_reclaim_revoke.sh
index ffbc7ef2b..da091a1ee 100755
--- a/src/reclaim/test_reclaim_revoke.sh
+++ b/src/reclaim/test_reclaim_revoke.sh
@@ -20,10 +20,10 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
20# (3) PKEY3.user -> PKEY4 20# (3) PKEY3.user -> PKEY4
21 21
22 22
23which timeout &> /dev/null && DO_TIMEOUT="timeout 30" 23which timeout >/dev/null 2&>1 && DO_TIMEOUT="timeout 30"
24 24
25TEST_ATTR="test" 25TEST_ATTR="test"
26gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null 26gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1
27gnunet-identity -C alice -c test_reclaim.conf 27gnunet-identity -C alice -c test_reclaim.conf
28gnunet-identity -C bob -c test_reclaim.conf 28gnunet-identity -C bob -c test_reclaim.conf
29gnunet-identity -C eve -c test_reclaim.conf 29gnunet-identity -C eve -c test_reclaim.conf
@@ -43,7 +43,7 @@ sleep 16
43echo "Consuming $TICKET" 43echo "Consuming $TICKET"
44 44
45gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf 45gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf
46if test $? == 0 46if test $? = 0
47then 47then
48 echo "Eve can still resolve attributes..." 48 echo "Eve can still resolve attributes..."
49 gnunet-arm -e -c test_reclaim.conf 49 gnunet-arm -e -c test_reclaim.conf
@@ -51,10 +51,10 @@ then
51fi 51fi
52 52
53gnunet-arm -e -c test_reclaim.conf 53gnunet-arm -e -c test_reclaim.conf
54gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null 54gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1
55 55
56gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 56gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf
57#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 2&>1 >/dev/null 57#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf >/dev/null 2&>1
58if test $? != 0 58if test $? != 0
59then 59then
60 echo "Bob cannot resolve attributes..." 60 echo "Bob cannot resolve attributes..."