diff options
author | Özgür Kesim <oec-taler@kesim.org> | 2023-05-12 13:40:22 +0200 |
---|---|---|
committer | Özgür Kesim <oec-taler@kesim.org> | 2023-05-12 13:40:22 +0200 |
commit | 4833234df63d7da774299b336adb925e700bd4b4 (patch) | |
tree | abb478b860c2d3f292ded9364300ce73b1d60d11 /src/testing/testing_api_helpers_bank.c | |
parent | 9130cda9e775131d3ced613b7f238a4c9e43ad5a (diff) | |
parent | ff1a28319fe31741958a0b1cfa761fd44878db45 (diff) | |
download | exchange-4833234df63d7da774299b336adb925e700bd4b4.tar.xz |
Merge branch 'master' into age-withdraw
Diffstat (limited to 'src/testing/testing_api_helpers_bank.c')
-rw-r--r-- | src/testing/testing_api_helpers_bank.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c index 2507a87e9..f2f92956d 100644 --- a/src/testing/testing_api_helpers_bank.c +++ b/src/testing/testing_api_helpers_bank.c @@ -30,6 +30,10 @@ #define BANK_FAIL() \ do {GNUNET_break (0); return NULL; } while (0) +#define JDBC_TALERCHECK \ + "jdbc:postgresql://localhost/talercheck?socketFactory=org.newsclub.net.unix." \ + "AFUNIXSocketFactory$FactoryArg&socketFactoryArg" \ + "=/var/run/postgresql/.s.PGSQL.5432" struct TALER_FAKEBANK_Handle * TALER_TESTING_run_fakebank (const char *bank_url, @@ -95,7 +99,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc) setenv ( "LIBEUFIN_NEXUS_DB_CONNECTION", - "jdbc:sqlite:/tmp/libeufin-exchange-test-nexusdb.sqlite3", + JDBC_TALERCHECK, 1); // not overwriting any potentially existing DB. nexus_proc = GNUNET_OS_start_process ( @@ -145,7 +149,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc) fprintf (stderr, "\n"); setenv ( "LIBEUFIN_SANDBOX_DB_CONNECTION", - "jdbc:sqlite:/tmp/libeufin-exchange-test-sandboxdb.sqlite3", + JDBC_TALERCHECK, 1); // not overwriting any potentially existing DB. setenv ( "LIBEUFIN_SANDBOX_ADMIN_PASSWORD", @@ -366,7 +370,12 @@ TALER_TESTING_prepare_libeufin (const char *config_filename, /* DB preparation */ if (reset_db) { - if (0 != system ("rm -f /tmp/libeufin-exchange-test-nexusdb.sqlite3")) + setenv ( + "LIBEUFIN_NEXUS_DB_CONNECTION", + JDBC_TALERCHECK, + 1); // not overwriting any potentially existing DB. + + if (0 != system ("libeufin-nexus reset-tables")) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to invoke db-removal command on nexusdb.\n"); @@ -374,7 +383,13 @@ TALER_TESTING_prepare_libeufin (const char *config_filename, GNUNET_CONFIGURATION_destroy (cfg); return GNUNET_SYSERR; } - if (0 != system ("rm -f /tmp/libeufin-exchange-test-sandboxdb.sqlite3")) + + setenv ( + "LIBEUFIN_SANDBOX_DB_CONNECTION", + JDBC_TALERCHECK, + 1); // not overwriting any potentially existing DB. + + if (0 != system ("libeufin-sandbox reset-tables")) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to invoke db-removal command on sandboxdb.\n"); |