[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] 01/02: ensure testcase terminates if wget
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] 01/02: ensure testcase terminates if wget is not installed or launching httpd failed |
Date: |
Wed, 08 Feb 2017 09:59:45 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit e9cdf641de26692025b622954e2d037686a7d880
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Feb 8 07:58:46 2017 +0100
ensure testcase terminates if wget is not installed or launching httpd
failed
---
src/exchange-lib/test_exchange_api.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/exchange-lib/test_exchange_api.c
b/src/exchange-lib/test_exchange_api.c
index 783bf51..5292da2 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -3065,6 +3065,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 +3123,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 +3136,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