summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-16 19:58:42 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-16 19:58:42 +0100
commitcd6a3b8de745b2e0b04cd962dcc48a50d254b07c (patch)
tree348621240ae13c02b64bd193e88d4632cc4899c0 /src/testing
parent9745e82c59a4b6f96b4611cde82ac90f1f6c30ba (diff)
downloadexchange-cd6a3b8de745b2e0b04cd962dcc48a50d254b07c.tar.gz
exchange-cd6a3b8de745b2e0b04cd962dcc48a50d254b07c.tar.bz2
exchange-cd6a3b8de745b2e0b04cd962dcc48a50d254b07c.zip
fix config for aggregator test
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test-taler-exchange-aggregator-postgres.conf13
-rw-r--r--src/testing/test_taler_exchange_aggregator.c15
-rw-r--r--src/testing/testing_api_helpers_exchange.c6
3 files changed, 20 insertions, 14 deletions
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index e188f508..dd03e0c4 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -19,7 +19,7 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# Expected base URL of the exchange. Used in wire transfers for
# the tracking API.
-BASE_URL = "https://exchange.taler.net/"
+BASE_URL = "http://localhost:8081/"
SIGNKEY_LEGAL_DURATION = 2 years
@@ -98,3 +98,14 @@ CLOSING-FEE-2024 = EUR:0.01
CLOSING-FEE-2025 = EUR:0.01
CLOSING-FEE-2026 = 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
diff --git a/src/testing/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c
index 6d057c37..2b3d642e 100644
--- a/src/testing/test_taler_exchange_aggregator.c
+++ b/src/testing/test_taler_exchange_aggregator.c
@@ -475,8 +475,6 @@ run (void *cls,
TALER_TESTING_cmd_end ()
};
- GNUNET_SCHEDULER_add_shutdown (&unload_db,
- NULL);
TALER_TESTING_run_with_fakebank (is,
all,
bc.exchange_auth.wire_gateway_url);
@@ -501,19 +499,10 @@ prepare_database (void *cls,
TALER_TESTING_interpreter_fail (is);
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);
GNUNET_assert (NULL != dbc.session);
-
+ GNUNET_SCHEDULER_add_shutdown (&unload_db,
+ NULL);
run (NULL,
is);
}
diff --git a/src/testing/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c
index 043bf8a0..f3a713af 100644
--- a/src/testing/testing_api_helpers_exchange.c
+++ b/src/testing/testing_api_helpers_exchange.c
@@ -723,6 +723,12 @@ TALER_TESTING_setup_with_exchange_cfg (
{
GNUNET_free (base_url);
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;
}
GNUNET_free (base_url);