diff options
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/Makefile.am | 1 | ||||
| -rw-r--r-- | src/testing/test_auditor_api_version.c | 12 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_check_keys.c | 13 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 73f9b9ec..faad3f73 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -148,6 +148,7 @@ test_auditor_api_LDADD = \ test_auditor_api_version_SOURCES = \ test_auditor_api_version.c test_auditor_api_version_LDADD = \ + libtalertesting.la \ $(top_builddir)/src/lib/libtalerauditor.la \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ diff --git a/src/testing/test_auditor_api_version.c b/src/testing/test_auditor_api_version.c index 62277e82..bf1094e3 100644 --- a/src/testing/test_auditor_api_version.c +++ b/src/testing/test_auditor_api_version.c @@ -151,8 +151,16 @@ main (int argc, " is your PATH correct?\n"); return 77; } - GNUNET_SCHEDULER_run (&run, - NULL); + if (0 != TALER_TESTING_wait_auditor_ready ("http://localhost:8083/")) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to launch `taler-auditor-httpd`\n"); + } + else + { + GNUNET_SCHEDULER_run (&run, + NULL); + } GNUNET_OS_process_kill (proc, SIGTERM); GNUNET_OS_process_wait (proc); GNUNET_OS_process_destroy (proc); diff --git a/src/testing/testing_api_cmd_check_keys.c b/src/testing/testing_api_cmd_check_keys.c index 6e5c694c..397ace56 100644 --- a/src/testing/testing_api_cmd_check_keys.c +++ b/src/testing/testing_api_cmd_check_keys.c @@ -69,12 +69,12 @@ struct CheckKeysState /** * Value X to set as the URL parameter: * "/keys?last_denom_issue=X" is used only when `set_last_denom' - * equals GNUNET_YES. + * equals #GNUNET_YES. */ struct GNUNET_TIME_Absolute last_denom_date; /** - * If GNUNET_YES, then we'll provide the "/keys" request. + * If #GNUNET_YES, then we'll provide the "/keys" request. * with the "now" argument. */ int with_now; @@ -160,11 +160,10 @@ check_keys_run (void *cls, { /* Did not get the expected number of denomination keys! */ GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Got %u keys in step %s, expected %u\n", - is->keys->num_denom_keys, - cmd->label, - cks->num_denom_keys); + TALER_LOG_ERROR ("Got %u keys in step %s, expected %u\n", + is->keys->num_denom_keys, + cmd->label, + cks->num_denom_keys); TALER_TESTING_interpreter_fail (is); return; } |