half baking #4756
This commit is contained in:
parent
4f304b2745
commit
1fe606a63b
@ -67,22 +67,35 @@ main (int argc,
|
|||||||
char * const *argv)
|
char * const *argv)
|
||||||
{
|
{
|
||||||
struct GNUNET_OS_Process *bankd;
|
struct GNUNET_OS_Process *bankd;
|
||||||
|
struct GNUNET_OS_Process *bankd_admin;
|
||||||
unsigned int cnt;
|
unsigned int cnt;
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
GNUNET_log_setup ("test-bank-api",
|
GNUNET_log_setup ("test-bank-api",
|
||||||
"WARNING",
|
"WARNING",
|
||||||
NULL);
|
NULL);
|
||||||
|
bankd_admin = GNUNET_OS_start_process (GNUNET_NO,
|
||||||
|
GNUNET_OS_INHERIT_STD_ALL,
|
||||||
|
NULL, NULL, NULL,
|
||||||
|
"taler-bank-manage",
|
||||||
|
"taler-bank-manage",
|
||||||
|
"--admin",
|
||||||
|
"serve-http",
|
||||||
|
"--port", "8081",
|
||||||
|
NULL);
|
||||||
bankd = GNUNET_OS_start_process (GNUNET_NO,
|
bankd = GNUNET_OS_start_process (GNUNET_NO,
|
||||||
GNUNET_OS_INHERIT_STD_ALL,
|
GNUNET_OS_INHERIT_STD_ALL,
|
||||||
NULL, NULL, NULL,
|
NULL, NULL, NULL,
|
||||||
"taler-bank-manage",
|
"taler-bank-manage",
|
||||||
"taler-bank-manage",
|
"taler-bank-manage",
|
||||||
"serve-http",
|
"serve-http",
|
||||||
"--port", "8081",
|
"--port", "8080",
|
||||||
NULL);
|
NULL);
|
||||||
if (NULL == bankd)
|
|
||||||
|
|
||||||
|
if ((NULL == bankd_admin) || (NULL == bankd))
|
||||||
{
|
{
|
||||||
|
/*FIXME: More accurate error message?*/
|
||||||
fprintf (stderr,
|
fprintf (stderr,
|
||||||
"taler-bank-manage not found, skipping test\n");
|
"taler-bank-manage not found, skipping test\n");
|
||||||
return 77; /* report 'skip' */
|
return 77; /* report 'skip' */
|
||||||
@ -99,13 +112,16 @@ main (int argc,
|
|||||||
if (cnt > 30)
|
if (cnt > 30)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/ -o /dev/null -O /dev/null"));
|
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8080/ -o /dev/null -O /dev/null"));
|
||||||
|
|
||||||
fprintf (stderr, "\n");
|
fprintf (stderr, "\n");
|
||||||
result = GNUNET_SYSERR;
|
result = GNUNET_SYSERR;
|
||||||
if (cnt <= 30)
|
if (cnt <= 30)
|
||||||
GNUNET_SCHEDULER_run (&run, &result);
|
GNUNET_SCHEDULER_run (&run, &result);
|
||||||
GNUNET_OS_process_kill (bankd,
|
GNUNET_OS_process_kill (bankd,
|
||||||
SIGTERM);
|
SIGTERM);
|
||||||
|
GNUNET_OS_process_kill (bankd_admin,
|
||||||
|
SIGTERM);
|
||||||
GNUNET_OS_process_wait (bankd);
|
GNUNET_OS_process_wait (bankd);
|
||||||
GNUNET_OS_process_destroy (bankd);
|
GNUNET_OS_process_destroy (bankd);
|
||||||
if (cnt > 30)
|
if (cnt > 30)
|
||||||
|
Loading…
Reference in New Issue
Block a user