diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/auditor-lib/Makefile.am | 1 | ||||
| -rw-r--r-- | src/auditor-lib/test_auditor_api.c | 6 | ||||
| -rw-r--r-- | src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c | 163 | ||||
| -rw-r--r-- | src/include/taler_testing_auditor_lib.h | 12 | 
4 files changed, 182 insertions, 0 deletions
| diff --git a/src/auditor-lib/Makefile.am b/src/auditor-lib/Makefile.am index df0b8b3d..72214a2d 100644 --- a/src/auditor-lib/Makefile.am +++ b/src/auditor-lib/Makefile.am @@ -44,6 +44,7 @@ libtalerauditortesting_la_SOURCES = \    testing_auditor_api_cmd_deposit_confirmation.c \    testing_auditor_api_cmd_exchanges.c \    testing_auditor_api_cmd_exec_auditor.c \ +  testing_auditor_api_cmd_exec_auditor_dbinit.c \    testing_auditor_api_cmd_exec_wire_auditor.c  libtalerauditortesting_la_LIBADD = \    libtalerauditor.la \ diff --git a/src/auditor-lib/test_auditor_api.c b/src/auditor-lib/test_auditor_api.c index 6393ce35..1702260d 100644 --- a/src/auditor-lib/test_auditor_api.c +++ b/src/auditor-lib/test_auditor_api.c @@ -125,6 +125,9 @@ static char *exchange_url;        EXCHANGE_ACCOUNT_NO, USER_LOGIN_NAME, USER_LOGIN_PASS, \        subject, exchange_url) +#define CMD_RUN_AUDITOR(label) \ +  TALER_TESTING_cmd_exec_auditor (label, CONFIG_FILE) +  /**   * Main function that will tell the interpreter what commands to @@ -137,6 +140,9 @@ run (void *cls,       struct TALER_TESTING_Interpreter *is)  {    struct TALER_TESTING_Command commands[] = { +    CMD_RUN_AUDITOR_DBINIT("virgin-auditor"), +    CMD_RUN_AUDITOR("virgin-auditor"), +      /**       * End the suite.  Fixme: better to have a label for this       * too, as it shows a "(null)" token on logs. diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c b/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c new file mode 100644 index 00000000..09771660 --- /dev/null +++ b/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c @@ -0,0 +1,163 @@ +/* +  This file is part of TALER +  Copyright (C) 2018 Taler Systems SA + +  TALER is free software; you can redistribute it and/or modify it +  under the terms of the GNU General Public License as published +  by the Free Software Foundation; either version 3, or (at your +  option) any later version. + +  TALER is distributed in the hope that it will be useful, but +  WITHOUT ANY WARRANTY; without even the implied warranty of +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +  GNU General Public License for more details. + +  You should have received a copy of the GNU General Public +  License along with TALER; see the file COPYING.  If not, +  see <http://www.gnu.org/licenses/> +*/ + +/** + * @file auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c + * @brief run the taler-auditor-dbinit "-r" command + * @author Marcello Stanisci + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler_json_lib.h" +#include <gnunet/gnunet_curl_lib.h> +#include "auditor_api_handle.h" +#include "taler_signatures.h" +#include "taler_testing_lib.h" + + +/** + * State for a "auditor-dbinit" CMD. + */ +struct AuditorDbinitState +{ + +  /** +   * Process for the "auditor-dbinit" command. +   */ +  struct GNUNET_OS_Process *auditor_dbinit_proc; + +  /** +   * Configuration file used by the command. +   */ +  const char *config_filename; +}; + + +/** + * Run the command; calls the `taler-auditor-dbinit' program. + * + * @param cls closure. + * @param cmd the commaind being run. + * @param is interpreter state. + */ +static void +auditor_dbinit_run (void *cls, +                    const struct TALER_TESTING_Command *cmd, +                    struct TALER_TESTING_Interpreter *is) +{ +  struct AuditorDbinitState *ks = cls; + +  ks->auditor_dbinit_proc +    = GNUNET_OS_start_process (GNUNET_NO, +                               GNUNET_OS_INHERIT_STD_ALL, +                               NULL, NULL, NULL, +                               "taler-auditor-dbinit", +                               "taler-auditor-dbinit", +                               "-c", ks->config_filename, +                               "-r", +                               NULL); +  if (NULL == ks->auditor_dbinit_proc) +  { +    GNUNET_break (0); +    TALER_TESTING_interpreter_fail (is); +    return; +  } +  TALER_TESTING_wait_for_sigchld (is); +} + + +/** + * Free the state of a "auditor-dbinit" CMD, and possibly kills its + * process if it did not terminate correctly. + * + * @param cls closure. + * @param cmd the command being freed. + */ +static void +auditor_dbinit_cleanup (void *cls, +                        const struct TALER_TESTING_Command *cmd) +{ +  struct AuditorDbinitState *ks = cls; + +  if (NULL != ks->auditor_dbinit_proc) +  { +    GNUNET_break (0 == +                  GNUNET_OS_process_kill (ks->auditor_dbinit_proc, +                                          SIGKILL)); +    GNUNET_OS_process_wait (ks->auditor_dbinit_proc); +    GNUNET_OS_process_destroy (ks->auditor_dbinit_proc); +    ks->auditor_dbinit_proc = NULL; +  } +  GNUNET_free (ks); +} + + +/** + * Offer "auditor-dbinit" CMD internal data to other commands. + * + * @param cls closure. + * @param ret[out] result + * @param trait name of the trait. + * @param index index number of the object to offer. + * @return #GNUNET_OK on success. + */ +static int +auditor_dbinit_traits (void *cls, +                       const void **ret, +                       const char *trait, +                       unsigned int index) +{ +  struct AuditorDbinitState *ks = cls; +  struct TALER_TESTING_Trait traits[] = { +    TALER_TESTING_make_trait_process (0, &ks->auditor_dbinit_proc), +    TALER_TESTING_trait_end () +  }; + +  return TALER_TESTING_get_trait (traits, +                                  ret, +                                  trait, +                                  index); +} + + +/** + * Make the "exec-auditor-dbinit" CMD. + * + * @param label command label. + * @param config_filename configuration filename. + * @return the command. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_exec_auditor_dbinit (const char *label, +                                       const char *config_filename) +{ +  struct TALER_TESTING_Command cmd; +  struct AuditorDbinitState *ks; + +  ks = GNUNET_new (struct AuditorDbinitState); +  ks->config_filename = config_filename; +  cmd.cls = ks; +  cmd.label = label; +  cmd.run = &auditor_dbinit_run; +  cmd.cleanup = &auditor_dbinit_cleanup; +  cmd.traits = &auditor_dbinit_traits; +  return cmd; +} + +/* end of testing_auditor_api_cmd_exec_auditor_dbinit.c */ diff --git a/src/include/taler_testing_auditor_lib.h b/src/include/taler_testing_auditor_lib.h index 297ab2b3..65f50b77 100644 --- a/src/include/taler_testing_auditor_lib.h +++ b/src/include/taler_testing_auditor_lib.h @@ -48,6 +48,18 @@ TALER_TESTING_cmd_exec_auditor (const char *label,  /** + * Make the "exec-auditor-dbinit" CMD. Always run with the "-r" option. + * + * @param label command label. + * @param config_filename configuration filename. + * @return the command. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_exec_auditor_dbinit (const char *label, +                                       const char *config_filename); + + +/**   * Make the "exec wire-auditor" CMD.   *   * @param label command label. | 
