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

merge aggregator

Browse Source
This commit is contained in:
Christian Grothoff 2017-03-24 13:41:21 +01:00
parent 6050dad63e
commit 7ebacc6fbd
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bank-lib/test_bank_api.c
View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
Copyright (C) 2016 GNUnet e.V.
Copyright (C) 2016, 2017 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@ -71,6 +71,15 @@ main (int argc,
unsigned int cnt;
int result;
if (GNUNET_OK !=
GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
8081))
{
fprintf (stderr,
"Required port %u not available, skipping.\n",
8081);
return 77;
}
GNUNET_log_setup ("test-bank-api",
"WARNING",
NULL);
@ -83,6 +92,12 @@ main (int argc,
"serve-http",
"--port", "8081",
NULL);
if (NULL == bankd_admin)
{
fprintf (stderr,
"Failed to launch `taler-bank-manage' for admin, skipping test\n");
return 77; /* report 'skip' */
}
bankd = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
@ -92,12 +107,14 @@ main (int argc,
"--port", "8080",
NULL);
if ((NULL == bankd_admin) || (NULL == bankd))
if (NULL == bankd)
{
/*FIXME: More accurate error message?*/
fprintf (stderr,
"taler-bank-manage not found, skipping test\n");
"Failed to launch taler-bank-manage, skipping test\n");
GNUNET_OS_process_kill (bankd_admin,
SIGTERM);
GNUNET_OS_process_wait (bankd_admin);
GNUNET_OS_process_destroy (bankd_admin);
return 77; /* report 'skip' */
}
/* give child time to start and bind against the socket */
@ -134,6 +151,8 @@ main (int argc,
SIGTERM);
GNUNET_OS_process_wait (bankd);
GNUNET_OS_process_destroy (bankd);
GNUNET_OS_process_wait (bankd_admin);
GNUNET_OS_process_destroy (bankd_admin);
if (cnt > 30)
{
fprintf (stderr,

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

@ -3187,6 +3187,24 @@ main (int argc,
GNUNET_log_setup ("test-exchange-api",
"INFO",
NULL);
if (GNUNET_OK !=
GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
8081))
{
fprintf (stderr,
"Required port %u not available, skipping.\n",
8081);
return 77;
}
if (GNUNET_OK !=
GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
8082))
{
fprintf (stderr,
"Required port %u not available, skipping.\n",
8082);
return 77;
}
proc = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,

9
src/exchange/test_taler_exchange_aggregator.c
View File

@ -1241,6 +1241,15 @@ main (int argc,
}
GNUNET_OS_process_wait (proc);
GNUNET_OS_process_destroy (proc);
if (GNUNET_OK !=
GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
8082))
{
fprintf (stderr,
"Required port %u not available, skipping.\n",
8082);
return 77;
}
cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK !=
GNUNET_CONFIGURATION_parse (cfg,