[GNUnet-SVN] [gnunet] 136/171: -fixes, add tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 6fce29c2dc4360da38f326c172ee2170f1688e36
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sat Oct 7 13:12:12 2017 +0200

    -fixes, add tests
---
 .../{test_idp_issue.sh => test_idp_attribute.sh}              |  7 -------
 .../{test_idp_issue.sh => test_idp_consume.sh}                |  9 +++------
 src/identity-provider/test_idp_issue.sh                       | 11 +++++------
 src/rest/rest.conf                                            |  1 +
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/identity-provider/test_idp_issue.sh 
b/src/identity-provider/test_idp_attribute.sh
similarity index 69%
copy from src/identity-provider/test_idp_issue.sh
copy to src/identity-provider/test_idp_attribute.sh
index 8cd1297d3..433dfa3c4 100755
--- a/src/identity-provider/test_idp_issue.sh
+++ b/src/identity-provider/test_idp_attribute.sh
@@ -24,16 +24,9 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 
 TEST_ATTR="test"
 gnunet-arm -s -c test_idp.conf
-gnunet-arm -i rest -c test_idp.conf
 gnunet-identity -C testego -c test_idp.conf
 gnunet-identity -C rpego -c test_idp.conf
-SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print 
$3}')
 TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print 
$3}')
 gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf
 gnunet-idp -e testego -a name -V John -c test_idp.conf
-#gnunet-idp -e testego -D -c test_idp.conf
-TICKET=$(gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c 
test_idp.conf | awk '{print $1}')
-curl http://localhost:7776/idp/attributes/testego
-#echo "Consuming $TICKET"
-gnunet-idp -e rpego -C $TICKET -c test_idp.conf
 gnunet-arm -e -c test_idp.conf
diff --git a/src/identity-provider/test_idp_issue.sh 
b/src/identity-provider/test_idp_consume.sh
similarity index 78%
copy from src/identity-provider/test_idp_issue.sh
copy to src/identity-provider/test_idp_consume.sh
index 8cd1297d3..0d05145e0 100755
--- a/src/identity-provider/test_idp_issue.sh
+++ b/src/identity-provider/test_idp_consume.sh
@@ -24,16 +24,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 
 TEST_ATTR="test"
 gnunet-arm -s -c test_idp.conf
-gnunet-arm -i rest -c test_idp.conf
 gnunet-identity -C testego -c test_idp.conf
 gnunet-identity -C rpego -c test_idp.conf
 SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print 
$3}')
 TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print 
$3}')
-gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf
-gnunet-idp -e testego -a name -V John -c test_idp.conf
-#gnunet-idp -e testego -D -c test_idp.conf
+gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf > /dev/null 
2>&1
+gnunet-idp -e testego -a name -V John -c test_idp.conf > /dev/null 2>&1
 TICKET=$(gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c 
test_idp.conf | awk '{print $1}')
-curl http://localhost:7776/idp/attributes/testego
-#echo "Consuming $TICKET"
+echo "Consuming ticket $TICKET"
 gnunet-idp -e rpego -C $TICKET -c test_idp.conf
 gnunet-arm -e -c test_idp.conf
diff --git a/src/identity-provider/test_idp_issue.sh 
b/src/identity-provider/test_idp_issue.sh
index 8cd1297d3..bf5783c9d 100755
--- a/src/identity-provider/test_idp_issue.sh
+++ b/src/identity-provider/test_idp_issue.sh
@@ -24,16 +24,15 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 
 TEST_ATTR="test"
 gnunet-arm -s -c test_idp.conf
-gnunet-arm -i rest -c test_idp.conf
+#gnunet-arm -i rest -c test_idp.conf
 gnunet-identity -C testego -c test_idp.conf
 gnunet-identity -C rpego -c test_idp.conf
 SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print 
$3}')
 TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print 
$3}')
-gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf
-gnunet-idp -e testego -a name -V John -c test_idp.conf
+gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf > /dev/null 
2>&1
+gnunet-idp -e testego -a name -V John -c test_idp.conf > /dev/null 2>&1
 #gnunet-idp -e testego -D -c test_idp.conf
 TICKET=$(gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c 
test_idp.conf | awk '{print $1}')
-curl http://localhost:7776/idp/attributes/testego
-#echo "Consuming $TICKET"
-gnunet-idp -e rpego -C $TICKET -c test_idp.conf
+#curl http://localhost:7776/idp/attributes/testego
+echo "Ticket: $TICKET"
 gnunet-arm -e -c test_idp.conf
diff --git a/src/rest/rest.conf b/src/rest/rest.conf
index 6cd013345..b86e6c1a0 100644
--- a/src/rest/rest.conf
+++ b/src/rest/rest.conf
@@ -1,4 +1,5 @@
 [rest]
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-rest.sock
 BINARY=gnunet-rest-server
 REST_PORT=7776
 REST_ALLOW_HEADERS=Authorization,Accept,Content-Type

-- 
To stop receiving notification emails like this one, please contact
address@hidden