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

removing use of bank's admin interface from bank-lib testcases

Browse Source
This commit is contained in:
Marcello Stanisci 2017-05-10 15:23:37 +02:00
parent 2c43ff7c0d
commit 6bf006e636
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,6 @@ 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;
@ -127,21 +126,6 @@ main (int argc,
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);
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, bankd = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL, GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL, NULL, NULL, NULL,
@ -155,10 +139,6 @@ main (int argc,
{ {
fprintf (stderr, fprintf (stderr,
"Failed to launch taler-bank-manage, 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' */ return 77; /* report 'skip' */
} }
/* give child time to start and bind against the socket */ /* give child time to start and bind against the socket */
@ -175,20 +155,6 @@ main (int argc,
} }
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8080/ -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"));
do
{
fprintf (stderr, ",");
sleep (1);
cnt++;
if (cnt > 30)
break;
result = system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/admin/add/incoming -o /dev/null -O /dev/null");
}
while (! ( (WIFEXITED (result)) &&
(8 == WEXITSTATUS (result)) ) );
/* Note: we are using "GET", so /admin/add/incoming will yield a 405, which causes wget to return
a status code of 8. */
fprintf (stderr, "\n"); fprintf (stderr, "\n");
result = GNUNET_SYSERR; result = GNUNET_SYSERR;
@ -200,12 +166,8 @@ main (int argc,
} }
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);
GNUNET_OS_process_wait (bankd_admin);
GNUNET_OS_process_destroy (bankd_admin);
if (cnt > 30) if (cnt > 30)
{ {
fprintf (stderr, fprintf (stderr,

2
src/bank-lib/test_bank_interpreter.c
View File

@ -590,7 +590,7 @@ interpreter_run (void *cls)
sizeof (cmd->details.admin_add_incoming.wtid)); sizeof (cmd->details.admin_add_incoming.wtid));
cmd->details.admin_add_incoming.aih cmd->details.admin_add_incoming.aih
= TALER_BANK_admin_add_incoming (is->ctx, = TALER_BANK_admin_add_incoming (is->ctx,
"http://localhost:8081", "http://localhost:8080",
&auth, &auth,
cmd->details.admin_add_incoming.exchange_base_url, cmd->details.admin_add_incoming.exchange_base_url,
&cmd->details.admin_add_incoming.wtid, &cmd->details.admin_add_incoming.wtid,