merchant

commit de00cd1cc4b243361fb0338461307a93114c8938
parent 5344133de68f7888ca5b589402ff727334758536
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  1 Jan 2016 22:43:23 +0100

wait separately for backend httpd to be up

Diffstat:
M
src/lib/test_merchant_api.c
 | 
13
+++++++++++--

1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -1542,6 +1542,15 @@ main (int argc,
                                    "taler-mint-httpd",
                                    "-d", "test-mint-home",
                                    NULL);
+  /* give child time to start and bind against the socket */
+  fprintf (stderr, "Waiting for taler-mint-httpd to be ready");
+  do
+    {
+      fprintf (stderr, ".");
+      sleep (1);
+    }
+  while (0 != system ("wget -q -t 1 -T 1 " MINT_URI "keys -o /dev/null -O /dev/null"));
+  fprintf (stderr, "\n");
   merchantd = GNUNET_OS_start_process (GNUNET_NO,
                                        GNUNET_OS_INHERIT_STD_ALL,
                                        NULL, NULL, NULL,
@@ -1550,13 +1559,13 @@ main (int argc,
                                        "-c", "test_merchant.conf",
                                        NULL);
   /* give child time to start and bind against the socket */
-  fprintf (stderr, "Waiting for taler-mint-httpd to be ready");
+  fprintf (stderr, "Waiting for taler-merchant-httpd to be ready");
   do
     {
       fprintf (stderr, ".");
       sleep (1);
     }
-  while (0 != system ("wget -q -t 1 -T 1 " MINT_URI "keys -o /dev/null -O /dev/null"));
+  while (0 != system ("wget -q -t 1 -T 1 " MERCHANT_URI " -o /dev/null -O /dev/null"));
   fprintf (stderr, "\n");
   result = GNUNET_SYSERR;
   GNUNET_SCHEDULER_run (&run, NULL);