add tests for plaintext and gns escrow

8 files changed, 83 insertions, 2 deletions

diff --git a/src/escrow/Makefile.am b/src/escrow/Makefile.am
index 2f3ada944..fa4fcdfe1 100644
--- a/src/escrow/Makefile.am
+++ b/src/escrow/Makefile.am
@@ -89,7 +89,9 @@ gnunet_escrow_LDADD = \
   $(GN_LIBINTL)
 
 check_SCRIPTS = \
-  test_escrow.sh
+  test_plaintext_escrow.sh \
+  test_gns_escrow.sh
+  # test_anastasis_escrow.sh
 
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/escrow/escrow_plugin_helper.c b/src/escrow/escrow_plugin_helper.c
index 07cb5e139..7a69d4a0d 100644
--- a/src/escrow/escrow_plugin_helper.c
+++ b/src/escrow/escrow_plugin_helper.c
@@ -75,6 +75,7 @@ ESCROW_list_ego (void *cls,
   struct EgoEntry *ego_entry;
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
 
+  // TODO: error when this method is called at cleanup if init is not yet finished
   if ((NULL == ego) && (ESCROW_PLUGIN_STATE_INIT == ph->state))
   {
     ph->state = ESCROW_PLUGIN_STATE_POST_INIT;
diff --git a/src/escrow/gnunet-escrow.c b/src/escrow/gnunet-escrow.c
index 32510587b..91ad4fbbe 100644
--- a/src/escrow/gnunet-escrow.c
+++ b/src/escrow/gnunet-escrow.c
@@ -217,9 +217,11 @@ verify_cb (void *cls,
       fprintf (stdout, "Escrow is valid!\n");
       break;
     case GNUNET_ESCROW_INVALID:
+      ret = 2;
       fprintf (stdout, "Escrow is INvalid! Please perform a new escrow.\n");
       break;
     default:
+      ret = 1;
       fprintf (stderr, "invalid verificationResult!\n");
   }
   cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
@@ -251,6 +253,7 @@ start_process ()
   {
     if (NULL == ego)
     {
+      ret = 1;
       fprintf (stderr, "Ego %s not found\n", put_ego);
       cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
       return;
@@ -267,6 +270,7 @@ start_process ()
   {
     if (NULL == ego)
     {
+      ret = 1;
       fprintf (stderr, "Ego %s not found\n", verify_ego);
       cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
       return;
@@ -284,6 +288,7 @@ start_process ()
   {
     if (NULL != ego)
     {
+      ret = 1;
       fprintf (stderr, "The name %s is already in use for an ego\n", get_ego);
       cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
       return;
@@ -301,6 +306,7 @@ start_process ()
   {
     if (NULL == ego)
     {
+      ret = 1;
       fprintf (stderr, "Ego %s not found\n", status_ego);
       cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
       return;
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index 3d3abdf29..64c0c66a3 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -245,6 +245,7 @@ libgnunet_plugin_escrow_anastasis_init (void *cls)
   api->anchor_string_to_data = &anastasis_anchor_string_to_data;
   api->cancel_plugin_operation = &cancel_anastasis_operation;
 
+  ph.state = ESCROW_PLUGIN_STATE_INIT;
   ph.id_init_cont = &anastasis_cont_init;
 
   identity_handle = GNUNET_IDENTITY_connect (cfg,
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index e55019ad9..b296f081a 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -344,6 +344,7 @@ libgnunet_plugin_escrow_gns_init (void *cls)
   api->anchor_string_to_data = &gns_anchor_string_to_data;
   api->cancel_plugin_operation = &cancel_gns_operation;
 
+  ph.state = ESCROW_PLUGIN_STATE_INIT;
   ph.id_init_cont = &gns_cont_init;
 
   identity_handle = GNUNET_IDENTITY_connect (cfg,
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index 83b2345c6..f4bd26f19 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -550,6 +550,7 @@ libgnunet_plugin_escrow_plaintext_init (void *cls)
   api->anchor_data_to_string = &plaintext_anchor_data_to_string;
   api->cancel_plugin_operation = &cancel_plaintext_operation;
 
+  ph.state = ESCROW_PLUGIN_STATE_INIT;
   ph.id_init_cont = &plaintext_cont_init;
 
   // set ego_create_cont here so it is called every time an ego is created
diff --git a/src/escrow/test_gns_escrow.sh b/src/escrow/test_gns_escrow.sh
new file mode 100755
index 000000000..00f8f3a49
--- /dev/null
+++ b/src/escrow/test_gns_escrow.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `gnunet-config -c test_escrow.conf -s PATHS -o GNUNET_HOME -f`
+
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
+
+gnunet-arm -s -c test_escrow.conf
+gnunet-identity -C testego -c test_escrow.conf
+ANCHOR=$(gnunet-escrow -m gns -P testego -c test_escrow.conf)
+if test $? != 0
+then
+        echo "GNS escrow failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+else
+        ANCHOR=$(echo $ANCHOR | awk 'NF>1{print $NF}')
+fi
+gnunet-escrow -m gns -V testego -a $ANCHOR -c test_escrow.conf
+if test $? != 0
+then
+        echo "GNS verification failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+fi
+gnunet-identity -D testego -c test_escrow.conf
+gnunet-escrow -m gns -G testego -a $ANCHOR -c test_escrow.conf
+if test $? != 0
+then
+        echo "GNS restore failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+fi
+gnunet-arm -e -c test_escrow.conf
+
+exit 0
diff --git a/src/escrow/test_escrow.sh b/src/escrow/test_plaintext_escrow.sh
index 92a1f1492..8113110e2 100755
--- a/src/escrow/test_escrow.sh
+++ b/src/escrow/test_plaintext_escrow.sh
@@ -18,8 +18,30 @@ which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 
 gnunet-arm -s -c test_escrow.conf
 gnunet-identity -C testego -c test_escrow.conf
-ANCHOR=$(gnunet-escrow -m plaintext -P testego -c test_escrow.conf | tail -1)
+ANCHOR=$(gnunet-escrow -m plaintext -P testego -c test_escrow.conf)
+if test $? != 0
+then
+        echo "Plaintext escrow failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+else
+        ANCHOR=$(echo $ANCHOR | awk 'NF>1{print $NF}')
+fi
 gnunet-escrow -m plaintext -V testego -a $ANCHOR -c test_escrow.conf
+if test $? != 0
+then
+        echo "Plaintext verification failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+fi
 gnunet-identity -D testego -c test_escrow.conf
 gnunet-escrow -m plaintext -G testego -a $ANCHOR -c test_escrow.conf
+if test $? != 0
+then
+        echo "Plaintext restore failed!"
+        gnunet-arm -e -c test_escrow.conf
+        exit 1
+fi
 gnunet-arm -e -c test_escrow.conf
+
+exit 0