diff options
author | Christian Grothoff <christian@grothoff.org> | 2024-01-17 20:27:25 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2024-01-17 20:27:25 +0100 |
commit | 3c484c71a2924cb20e7468a325ca7e230068febb (patch) | |
tree | 892a1162b694aad4a07a23f8e92fbe69865b66fa | |
parent | 3db8ffe54274ee94cc6204463b6c425ba7bcebf7 (diff) | |
download | exchange-3c484c71a2924cb20e7468a325ca7e230068febb.tar.xz |
remove auditor tests for now, auditor is temporarily not working due to major refactoring in progress
-rw-r--r-- | src/auditor/taler-helper-auditor-deposits.c | 41 | ||||
-rw-r--r-- | src/testing/Makefile.am | 8 | ||||
-rwxr-xr-x | src/testing/taler-unified-setup.sh | 6 |
3 files changed, 41 insertions, 14 deletions
diff --git a/src/auditor/taler-helper-auditor-deposits.c b/src/auditor/taler-helper-auditor-deposits.c index ac5fe6861..271f1c363 100644 --- a/src/auditor/taler-helper-auditor-deposits.c +++ b/src/auditor/taler-helper-auditor-deposits.c @@ -60,6 +60,14 @@ static int global_ret; /** + * Run in test mode. Exit when idle instead of + * going to sleep and waiting for more work. + * + * FIXME: not yet implemented! + */ +static int test_mode; + +/** * Array of reports about missing deposit confirmations. */ static json_t *report_deposit_confirmation_inconsistencies; @@ -322,13 +330,6 @@ db_notify (void *cls, (void) extra; (void) extra_size; - if (GNUNET_OK != - TALER_ARL_init (cfg)) - { - global_ret = EXIT_FAILURE; - return; - } - if (NULL == (db_plugin = TALER_AUDITORDB_plugin_load (cfg))) { @@ -348,7 +349,8 @@ db_notify (void *cls, return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deposit audit complete\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deposit audit complete\n"); TALER_ARL_done ( GNUNET_JSON_PACK ( GNUNET_JSON_pack_array_steal ("deposit_confirmation_inconsistencies", @@ -365,6 +367,22 @@ db_notify (void *cls, /** + * Function called on shutdown. + */ +static void +do_shutdown (void *cls) +{ + (void) cls; + + db_plugin->event_listen_cancel (eh); + eh = NULL; + TALER_AUDITORDB_plugin_unload (db_plugin); + db_plugin = NULL; + TALER_ARL_done (NULL); +} + + +/** * Main function that will be run. * * @param cls closure @@ -382,6 +400,9 @@ run (void *cls, (void) args; (void) cfgfile; cfg = c; + + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, + NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Launching deposit auditor\n"); if (GNUNET_OK != @@ -467,6 +488,10 @@ main (int argc, "KEY", "public key of the exchange (Crockford base32 encoded)", &TALER_ARL_master_pub), + GNUNET_GETOPT_option_flag ('t', + "test", + "run in test mode and exit when idle", + &test_mode), GNUNET_GETOPT_option_timetravel ('T', "timetravel"), GNUNET_GETOPT_OPTION_END diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index f1e7f1cce..7bbbe8e5e 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -145,9 +145,6 @@ AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH= .NOTPARALLEL: check_PROGRAMS = \ - test_auditor_api_cs \ - test_auditor_api_rsa \ - test_auditor_api_version \ test_bank_api_with_fakebank \ test_bank_api_with_nexus \ test_exchange_api_cs \ @@ -176,6 +173,11 @@ if HAVE_TWISTER test_bank_api_with_fakebank_twisted endif +# Removed for now... +# test_auditor_api_cs +# test_auditor_api_rsa +# test_auditor_api_version + TESTS = \ diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh index 02d502237..3ecdc793a 100755 --- a/src/testing/taler-unified-setup.sh +++ b/src/testing/taler-unified-setup.sh @@ -671,9 +671,9 @@ then $USE_VALGRIND taler-auditor-httpd \ -L "$LOGLEVEL" \ -c "$CONF" 2> taler-auditor-httpd.log & - $USE_VALGRIND taler-helper-auditor-deposits \ - -L "$LOGLEVEL" \ - -c "$CONF" 2> taler-helper-auditor.log & +# $USE_VALGRIND taler-helper-auditor-deposits \ +# -L "$LOGLEVEL" \ +# -c "$CONF" 2> taler-helper-auditor.log & echo " DONE" fi |