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

fix #6480

Browse Source
This commit is contained in:
Christian Grothoff 2020-08-14 14:42:58 +02:00
parent e8ea6bf1e7
commit d8256207a1
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/testing/test_bank_api_twisted.c
View File

@ -91,7 +91,12 @@ run (void *cls,
memcpy (&exchange_auth_twisted, memcpy (&exchange_auth_twisted,
&bc.exchange_auth, &bc.exchange_auth,
sizeof (struct TALER_BANK_AuthenticationData)); sizeof (struct TALER_BANK_AuthenticationData));
exchange_auth_twisted.wire_gateway_url = "http://localhost:8888/2/"; if (with_fakebank)
exchange_auth_twisted.wire_gateway_url =
"http://localhost:8888/2/";
else
exchange_auth_twisted.wire_gateway_url =
"http://localhost:8888/taler-wire-gateway/Exchange/";
struct TALER_TESTING_Command commands[] = { struct TALER_TESTING_Command commands[] = {
/* Test retrying transfer after failure. */ /* Test retrying transfer after failure. */
@ -156,7 +161,7 @@ int
main (int argc, main (int argc,
char *const *argv) char *const *argv)
{ {
unsigned int ret; int ret;
const char *cfgfilename; const char *cfgfilename;
/* These environment variables get in the way... */ /* These environment variables get in the way... */

24
src/testing/test_exchange_api_twisted.c
View File

@ -70,9 +70,10 @@ static struct GNUNET_OS_Process *twisterd;
* @param label label to use for the command. * @param label label to use for the command.
*/ */
static struct TALER_TESTING_Command static struct TALER_TESTING_Command
CMD_EXEC_WIREWATCH (char *label) CMD_EXEC_WIREWATCH (const char *label)
{ {
return TALER_TESTING_cmd_exec_wirewatch (label, CONFIG_FILE); return TALER_TESTING_cmd_exec_wirewatch (label,
CONFIG_FILE);
} }
@ -85,7 +86,8 @@ CMD_EXEC_WIREWATCH (char *label)
* @param url exchange_url * @param url exchange_url
*/ */
static struct TALER_TESTING_Command static struct TALER_TESTING_Command
CMD_TRANSFER_TO_EXCHANGE (char *label, char *amount) CMD_TRANSFER_TO_EXCHANGE (const char *label,
const char *amount)
{ {
return TALER_TESTING_cmd_admin_add_incoming (label, return TALER_TESTING_cmd_admin_add_incoming (label,
amount, amount,
@ -258,7 +260,8 @@ run (void *cls,
static void static void
purge_process (struct GNUNET_OS_Process *process) purge_process (struct GNUNET_OS_Process *process)
{ {
GNUNET_OS_process_kill (process, SIGINT); GNUNET_OS_process_kill (process,
SIGINT);
GNUNET_OS_process_wait (process); GNUNET_OS_process_wait (process);
GNUNET_OS_process_destroy (process); GNUNET_OS_process_destroy (process);
} }
@ -268,25 +271,23 @@ int
main (int argc, main (int argc,
char *const *argv) char *const *argv)
{ {
unsigned int ret; int ret;
/* These environment variables get in the way... */ /* These environment variables get in the way... */
unsetenv ("XDG_DATA_HOME"); unsetenv ("XDG_DATA_HOME");
unsetenv ("XDG_CONFIG_HOME"); unsetenv ("XDG_CONFIG_HOME");
GNUNET_log_setup ("test-exchange-api-twisted", GNUNET_log_setup ("test-exchange-api-twisted",
"DEBUG", NULL); "DEBUG",
NULL);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE, TALER_TESTING_prepare_fakebank (CONFIG_FILE,
"exchange-account-2", "exchange-account-2",
&bc)) &bc))
return 77; return 77;
if (NULL == (twister_url = TALER_TWISTER_prepare_twister if (NULL == (twister_url = TALER_TWISTER_prepare_twister
(CONFIG_FILE))) (CONFIG_FILE)))
return 77; return 77;
TALER_TESTING_cleanup_files (CONFIG_FILE); TALER_TESTING_cleanup_files (CONFIG_FILE);
switch (TALER_TESTING_prepare_exchange (CONFIG_FILE, switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
GNUNET_YES, GNUNET_YES,
&ec)) &ec))
@ -296,12 +297,9 @@ main (int argc,
return 1; return 1;
case GNUNET_NO: case GNUNET_NO:
return 77; return 77;
case GNUNET_OK: case GNUNET_OK:
if (NULL == (twisterd = TALER_TWISTER_run_twister (CONFIG_FILE))) if (NULL == (twisterd = TALER_TWISTER_run_twister (CONFIG_FILE)))
return 77; return 77;
ret = TALER_TESTING_setup_with_exchange (&run, ret = TALER_TESTING_setup_with_exchange (&run,
NULL, NULL,
CONFIG_FILE); CONFIG_FILE);