From 1b728334b42c3a35cc391df73ed76e171e0bb128 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Thu, 9 May 2019 19:15:24 +0200 Subject: [PATCH] RECLAIM: Update tests --- src/reclaim/test_reclaim_attribute.sh | 2 +- src/reclaim/test_reclaim_consume.sh | 4 ++-- src/reclaim/test_reclaim_issue.sh | 4 ++-- src/reclaim/test_reclaim_revoke.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/reclaim/test_reclaim_attribute.sh b/src/reclaim/test_reclaim_attribute.sh index 39bd715b7..744c898ed 100755 --- 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 36c8052d0..55f6ff22c 100755 --- 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 6a71470e1..7ab8a6980 100755 --- 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 b20a27d12..ffbc7ef2b 100755 --- 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}') -- 2.25.1