[GNUnet-SVN] [taler-exchange] branch master updated (aca6003 -> 3592083)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

    from aca6003  skip test if binaries are not in PATH
     new e9cdf64  ensure testcase terminates if wget is not installed or 
launching httpd failed
     new 3592083  do not print warnings for perfectly expected status codes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/exchange-lib/test_exchange_api.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/exchange-lib/test_exchange_api.c 
b/src/exchange-lib/test_exchange_api.c
index 783bf51..aa18f65 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -1590,6 +1590,12 @@ deposit_wtid_cb (void *cls,
       }
     }
     break;
+  case MHD_HTTP_ACCEPTED:
+    /* allowed, nothing to check here */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* allowed, nothing to check here */
+    break;
   default:
     GNUNET_break (0);
     break;
@@ -3065,6 +3071,7 @@ main (int argc,
   struct GNUNET_SIGNAL_Context *shc_chld;
   enum GNUNET_OS_ProcessStatusType type;
   unsigned long code;
+  unsigned int iter;
 
   /* These might get in the way... */
   unsetenv ("XDG_DATA_HOME");
@@ -3122,7 +3129,7 @@ main (int argc,
        (0 != code) )
   {
     fprintf (stderr,
-             "Unexpected error running taler-exchange-dbinit!\n");
+             "Unexpected error running `taler-exchange-dbinit'!\n");
     return 1;
   }
   exchanged = GNUNET_OS_start_process (GNUNET_NO,
@@ -3135,11 +3142,23 @@ main (int argc,
                                        NULL);
   /* give child time to start and bind against the socket */
   fprintf (stderr,
-           "Waiting for taler-exchange-httpd to be ready");
+           "Waiting for `taler-exchange-httpd' to be ready");
+  iter = 0;
   do
     {
+      if (10 == iter)
+      {
+       fprintf (stderr,
+                "Failed to launch `taler-exchange-httpd' (or `wget')\n");
+       GNUNET_OS_process_kill (exchanged,
+                               SIGTERM);
+       GNUNET_OS_process_wait (exchanged);
+       GNUNET_OS_process_destroy (exchanged);
+       return 77;
+      }
       fprintf (stderr, ".");
       sleep (1);
+      iter++;
     }
   while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/keys -o 
/dev/null -O /dev/null"));
   fprintf (stderr, "\n");

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