RECLAIM: Update tests

diff --git a/src/reclaim/test_reclaim_attribute.sh b/src/reclaim/test_reclaim_attribute.sh
index 39bd715b792c2dfcc6f8aac8c84e828e54086328..744c898edd503f9b68c5d7ec49a1a21a3f2958a3 100755 (executable)
--- a/src/reclaim/test_reclaim_attribute.sh
+++ b/src/reclaim/test_reclaim_attribute.sh
@@ -27,7 +27,7 @@ gnunet-arm -s -c test_reclaim.conf
 #gnunet-arm -i rest -c test_reclaim.conf
 gnunet-identity -C testego -c test_reclaim.conf
 gnunet-identity -C rpego -c test_reclaim.conf
-TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}')
+TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
 gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
 gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf > /dev/null 2>&1
 if test $? != 0

diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh
index 36c8052d05e9de8016594ec0d0fdcbc6a8c5328a..55f6ff22cc52509b66e206172e28af04e622ce3a 100755 (executable)
--- a/src/reclaim/test_reclaim_consume.sh
+++ b/src/reclaim/test_reclaim_consume.sh
@@ -27,8 +27,8 @@ gnunet-arm -s -c test_reclaim.conf
 #gnunet-arm -i rest -c test_reclaim.conf
 gnunet-identity -C testego -c test_reclaim.conf
 gnunet-identity -C rpego -c test_reclaim.conf
-SUBJECT_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep rpego | awk '{print $3}')
-TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}')
+SUBJECT_KEY=$(gnunet-identity -d -e rpego -q -c test_reclaim.conf)
+TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
 gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
 gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
 TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}')

diff --git a/src/reclaim/test_reclaim_issue.sh b/src/reclaim/test_reclaim_issue.sh
index 6a71470e177dbcd00f880712abb603ac569c6845..7ab8a698019fb4d256f83b207c2d973e3d2ea232 100755 (executable)
--- a/src/reclaim/test_reclaim_issue.sh
+++ b/src/reclaim/test_reclaim_issue.sh
@@ -27,8 +27,8 @@ gnunet-arm -s -c test_reclaim.conf
 #gnunet-arm -i rest -c test_reclaim.conf
 gnunet-identity -C testego -c test_reclaim.conf
 gnunet-identity -C rpego -c test_reclaim.conf
-SUBJECT_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep rpego | awk '{print $3}')
-TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}')
+SUBJECT_KEY=$(gnunet-identity -d -e rpego -q -c test_reclaim.conf)
+TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
 gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf > /dev/null 2>&1
 gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf > /dev/null 2>&1
 #gnunet-reclaim -e testego -D -c test_reclaim.conf

diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/reclaim/test_reclaim_revoke.sh
index b20a27d127241edf0dfc695f46a2da9624991f9c..ffbc7ef2b8fe81bfa949d3be32f462d11489aa72 100755 (executable)
--- a/src/reclaim/test_reclaim_revoke.sh
+++ b/src/reclaim/test_reclaim_revoke.sh
@@ -27,9 +27,9 @@ gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null
 gnunet-identity -C alice -c test_reclaim.conf
 gnunet-identity -C bob -c test_reclaim.conf
 gnunet-identity -C eve -c test_reclaim.conf
-ALICE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep alice | awk '{print $3}')
-BOB_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep bob | awk '{print $3}')
-EVE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep eve | awk '{print $3}')
+ALICE_KEY=$(gnunet-identity -d -e alice -q -c test_reclaim.conf)
+BOB_KEY=$(gnunet-identity -d -e bob -q -c test_reclaim.conf)
+EVE_KEY=$(gnunet-identity -d -e eve -q -c test_reclaim.conf)
 gnunet-reclaim -e alice -E 15s -a email -V john@doe.gnu -c test_reclaim.conf
 gnunet-reclaim -e alice -E 15s -a name -V John -c test_reclaim.conf
 TICKET_BOB=$(gnunet-reclaim -e alice -i "email,name" -r $BOB_KEY -c test_reclaim.conf | awk '{print $1}')