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

fix config for aggregator test

Browse Source
This commit is contained in:
Christian Grothoff 2020-12-16 19:58:42 +01:00
parent 9745e82c59
commit cd6a3b8de7
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/testing/test-taler-exchange-aggregator-postgres.conf
View File

@ -19,7 +19,7 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# Expected base URL of the exchange. Used in wire transfers for # Expected base URL of the exchange. Used in wire transfers for
# the tracking API. # the tracking API.
BASE_URL = "https://exchange.taler.net/" BASE_URL = "http://localhost:8081/"
SIGNKEY_LEGAL_DURATION = 2 years SIGNKEY_LEGAL_DURATION = 2 years
@ -98,3 +98,14 @@ CLOSING-FEE-2024 = EUR:0.01
CLOSING-FEE-2025 = EUR:0.01 CLOSING-FEE-2025 = EUR:0.01
CLOSING-FEE-2026 = EUR:0.01 CLOSING-FEE-2026 = EUR:0.01
CLOSING-FEE-2027 = EUR:0.01 CLOSING-FEE-2027 = EUR:0.01
[coin_eur_ct_1]
value = EUR:0.01
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
fee_withdraw = EUR:0.00
fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
rsa_keysize = 1024

15
src/testing/test_taler_exchange_aggregator.c
View File

@ -475,8 +475,6 @@ run (void *cls,
TALER_TESTING_cmd_end () TALER_TESTING_cmd_end ()
}; };
GNUNET_SCHEDULER_add_shutdown (&unload_db,
NULL);
TALER_TESTING_run_with_fakebank (is, TALER_TESTING_run_with_fakebank (is,
all, all,
bc.exchange_auth.wire_gateway_url); bc.exchange_auth.wire_gateway_url);
@ -501,19 +499,10 @@ prepare_database (void *cls,
TALER_TESTING_interpreter_fail (is); TALER_TESTING_interpreter_fail (is);
return; return;
} }
if (GNUNET_OK !=
dbc.plugin->create_tables (dbc.plugin->cls))
{
GNUNET_break (0);
TALER_EXCHANGEDB_plugin_unload (dbc.plugin);
dbc.plugin = NULL;
result = 77;
TALER_TESTING_interpreter_fail (is);
return;
}
dbc.session = dbc.plugin->get_session (dbc.plugin->cls); dbc.session = dbc.plugin->get_session (dbc.plugin->cls);
GNUNET_assert (NULL != dbc.session); GNUNET_assert (NULL != dbc.session);
GNUNET_SCHEDULER_add_shutdown (&unload_db,
NULL);
run (NULL, run (NULL,
is); is);
} }

6
src/testing/testing_api_helpers_exchange.c
View File

@ -723,6 +723,12 @@ TALER_TESTING_setup_with_exchange_cfg (
{ {
GNUNET_free (base_url); GNUNET_free (base_url);
stop_helpers (helpers); stop_helpers (helpers);
GNUNET_break (0 ==
GNUNET_OS_process_kill (exchanged,
SIGTERM));
GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (exchanged));
GNUNET_OS_process_destroy (exchanged);
return 77; return 77;
} }
GNUNET_free (base_url); GNUNET_free (base_url);