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

aggregator test now does also needs exchange running, if only to post the fees initially

Browse Source
This commit is contained in:
Christian Grothoff 2020-12-16 19:40:33 +01:00
parent 9d3e052ad3
commit 9745e82c59
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,8 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# the tracking API. # the tracking API.
BASE_URL = "https://exchange.taler.net/" BASE_URL = "https://exchange.taler.net/"
SIGNKEY_LEGAL_DURATION = 2 years
[auditor] [auditor]
BASE_URL = "http://auditor.example.com/" BASE_URL = "http://auditor.example.com/"

33
src/testing/test_taler_exchange_aggregator.c
View File

@ -484,23 +484,22 @@ run (void *cls,
/** /**
* Prepare database an launch the test. * Prepare database and launch the test.
* *
* @param cls unused * @param cls unused
* @param cfg our configuration * @param is interpreter to use
* @return #GNUNET_NO if database could not be prepared,
* otherwise #GNUNET_OK
*/ */
static int static void
prepare_database (void *cls, prepare_database (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg) struct TALER_TESTING_Interpreter *is)
{ {
dbc.plugin = TALER_EXCHANGEDB_plugin_load (cfg); dbc.plugin = TALER_EXCHANGEDB_plugin_load (is->cfg);
if (NULL == dbc.plugin) if (NULL == dbc.plugin)
{ {
GNUNET_break (0); GNUNET_break (0);
result = 77; result = 77;
return GNUNET_NO; TALER_TESTING_interpreter_fail (is);
return;
} }
if (GNUNET_OK != if (GNUNET_OK !=
dbc.plugin->create_tables (dbc.plugin->cls)) dbc.plugin->create_tables (dbc.plugin->cls))
@ -509,17 +508,14 @@ prepare_database (void *cls,
TALER_EXCHANGEDB_plugin_unload (dbc.plugin); TALER_EXCHANGEDB_plugin_unload (dbc.plugin);
dbc.plugin = NULL; dbc.plugin = NULL;
result = 77; result = 77;
return GNUNET_NO; 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);
result = TALER_TESTING_setup (&run, run (NULL,
NULL, is);
cfg,
NULL, // no exchange process handle.
GNUNET_NO); // do not try to connect to the exchange
return GNUNET_OK;
} }
@ -570,10 +566,11 @@ main (int argc,
TALER_LOG_WARNING ("Could not prepare the fakebank\n"); TALER_LOG_WARNING ("Could not prepare the fakebank\n");
return 77; return 77;
} }
result = GNUNET_OK;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_parse_and_run (config_filename, TALER_TESTING_setup_with_exchange (&prepare_database,
&prepare_database, NULL,
NULL)) config_filename))
{ {
TALER_LOG_WARNING ("Could not prepare database for tests.\n"); TALER_LOG_WARNING ("Could not prepare database for tests.\n");
return result; return result;