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

place nexus/sandbox sqlite3 DBs under /tmp,

Browse Source 
and fix their deletion before running the test.
This commit is contained in:
MS 2020-06-06 02:02:48 +02:00
parent 71eeb72b21
commit 14b001fea0
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
1 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/testing/testing_api_helpers_bank.c
View File

@ -125,6 +125,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
"nexus", "nexus",
"nexus", "nexus",
"serve", "serve",
"--db-name", "/tmp/nexus-exchange-test.sqlite3",
NULL); NULL);
if (NULL == nexus_proc) if (NULL == nexus_proc)
{ {
@ -169,6 +170,8 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
NULL, NULL, NULL, NULL, NULL, NULL,
"sandbox", "sandbox",
"sandbox", "sandbox",
"serve",
"--db-name", "/tmp/sandbox-exchange-test.sqlite3",
NULL); NULL);
if (NULL == sandbox_proc) if (NULL == sandbox_proc)
{ {
@ -210,6 +213,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
GNUNET_OS_process_kill (sandbox_proc, SIGTERM); GNUNET_OS_process_kill (sandbox_proc, SIGTERM);
GNUNET_OS_process_wait (sandbox_proc); GNUNET_OS_process_wait (sandbox_proc);
GNUNET_OS_process_destroy (sandbox_proc); GNUNET_OS_process_destroy (sandbox_proc);
TALER_LOG_ERROR ("Could not prepare nexus\n");
GNUNET_break (0); GNUNET_break (0);
return ret; return ret;
} }
@ -353,9 +357,6 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
{ {
struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CONFIGURATION_Handle *cfg;
unsigned long long port; unsigned long long port;
struct GNUNET_OS_Process *dbreset_proc;
enum GNUNET_OS_ProcessStatusType type;
unsigned long code;
char *database = NULL; // silence compiler char *database = NULL; // silence compiler
char *exchange_payto_uri; char *exchange_payto_uri;
@ -413,15 +414,7 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
/* DB preparation */ /* DB preparation */
if (GNUNET_YES == reset_db) if (GNUNET_YES == reset_db)
{ {
if (NULL == if (0 != system ("rm -f /tmp/nexus-exchange-test.sqlite3 && rm -f /tmp/sandbox-exchange-test.sqlite3"))
(dbreset_proc = GNUNET_OS_start_process (
GNUNET_NO,
GNUNET_OS_INHERIT_STD_NONE,
NULL, NULL, NULL,
"rm",
"rm",
"-f",
"libeufin-nexus.sqlite3", NULL)))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to invoke db-removal command.\n"); "Failed to invoke db-removal command.\n");
@ -429,36 +422,8 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_SYSERR ==
GNUNET_OS_process_wait_status (dbreset_proc,
&type,
&code))
{
GNUNET_OS_process_destroy (dbreset_proc);
GNUNET_break (0);
GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR;
}
if ( (type == GNUNET_OS_PROCESS_EXITED) &&
(0 != code) )
{
fprintf (stderr,
"db-removal command was unsuccessful\n");
GNUNET_break (0);
GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR;
}
if ( (type != GNUNET_OS_PROCESS_EXITED) ||
(0 != code) )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Unexpected error running `rm libeufin-nexus.sqlite3'!\n");
GNUNET_break (0);
GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR;
}
GNUNET_OS_process_destroy (dbreset_proc);
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_BANK_auth_parse_cfg (cfg, TALER_BANK_auth_parse_cfg (cfg,
config_section, config_section,
@ -744,7 +709,7 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
bc->exchange_payto); bc->exchange_payto);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n", GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n",
bc->user42_payto); bc->user42_payto);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n", GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user43_payto: %s\n",
bc->user43_payto); bc->user43_payto);
return GNUNET_OK; return GNUNET_OK;
} }