taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ensure testcase terminates if wget is not installed or launching httpd failed

Browse Source
This commit is contained in:
Christian Grothoff 2017-02-08 07:58:46 +01:00
parent aca6003d42
commit e9cdf641de
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/exchange-lib/test_exchange_api.c
View File

@ -3065,6 +3065,7 @@ main (int argc,
struct GNUNET_SIGNAL_Context *shc_chld; struct GNUNET_SIGNAL_Context *shc_chld;
enum GNUNET_OS_ProcessStatusType type; enum GNUNET_OS_ProcessStatusType type;
unsigned long code; unsigned long code;
unsigned int iter;
/* These might get in the way... */ /* These might get in the way... */
unsetenv ("XDG_DATA_HOME"); unsetenv ("XDG_DATA_HOME");
@ -3122,7 +3123,7 @@ main (int argc,
(0 != code) ) (0 != code) )
{ {
fprintf (stderr, fprintf (stderr,
"Unexpected error running taler-exchange-dbinit!\n"); "Unexpected error running `taler-exchange-dbinit'!\n");
return 1; return 1;
} }
exchanged = GNUNET_OS_start_process (GNUNET_NO, exchanged = GNUNET_OS_start_process (GNUNET_NO,
@ -3135,11 +3136,23 @@ main (int argc,
NULL); NULL);
/* give child time to start and bind against the socket */ /* give child time to start and bind against the socket */
fprintf (stderr, fprintf (stderr,
"Waiting for taler-exchange-httpd to be ready"); "Waiting for `taler-exchange-httpd' to be ready");
iter = 0;
do 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, "."); fprintf (stderr, ".");
sleep (1); 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")); 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"); fprintf (stderr, "\n");