add taler-auditor-offline test command, fixes test_auditor_api warnings

5 files changed, 189 insertions, 20 deletions

diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 1f678b434..f50e13a21 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1187,7 +1187,6 @@ TALER_TESTING_cmd_admin_add_incoming_retry (struct TALER_TESTING_Command cmd);
  *
  * @param label command label.
  * @param config_filename configuration filename.
- *
  * @return the command.
  */
 struct TALER_TESTING_Command
@@ -1196,7 +1195,7 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label,
 
 
 /**
- * Make a "aggregator" CMD.
+ * Run a "taler-exchange-aggregator" CMD.
  *
  * @param label command label.
  * @param config_filename configuration file for the
@@ -1209,6 +1208,19 @@ TALER_TESTING_cmd_exec_aggregator (const char *label,
 
 
 /**
+ * Run a "taler-auditor-offline" CMD.
+ *
+ * @param label command label.
+ * @param config_filename configuration file for the
+ *                        aggregator to use.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_auditor_offline (const char *label,
+                                        const char *config_filename);
+
+
+/**
  * Make a "aggregator" CMD and do not disable KYC checks.
  *
  * @param label command label.
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index d02e6377f..73ae6d4ab 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -57,6 +57,7 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_deposit.c \
   testing_api_cmd_deposits_get.c \
   testing_api_cmd_exec_aggregator.c \
+  testing_api_cmd_exec_auditor-offline.c \
   testing_api_cmd_exec_closer.c \
   testing_api_cmd_exec_transfer.c \
   testing_api_cmd_exec_wirewatch.c \
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
index 8c33c14fc..67d170ef8 100644
--- a/src/testing/test_auditor_api.c
+++ b/src/testing/test_auditor_api.c
@@ -647,6 +647,8 @@ run (void *cls,
                                               CONFIG_FILE),
     TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
                                                 2),
+    TALER_TESTING_cmd_exec_auditor_offline ("auditor-offline",
+                                            CONFIG_FILE),
     CMD_RUN_AUDITOR ("virgin-auditor"),
     TALER_TESTING_cmd_exchanges_with_url ("check-exchange",
                                           MHD_HTTP_OK,
diff --git a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
index 54b5dd6c3..df32b352b 100644
--- a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
+++ b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
@@ -207,7 +207,8 @@ deposit_confirmation_run (void *cls,
   const struct GNUNET_TIME_Absolute *exchange_timestamp = NULL;
   struct GNUNET_TIME_Absolute timestamp;
   const struct GNUNET_TIME_Absolute *wire_deadline;
-  struct GNUNET_TIME_Absolute refund_deadline;
+  struct GNUNET_TIME_Absolute refund_deadline
+    = GNUNET_TIME_UNIT_ZERO_ABS;
   struct TALER_Amount amount_without_fee;
   struct TALER_CoinSpendPublicKeyP coin_pub;
   const struct TALER_MerchantPrivateKeyP *merchant_priv;
@@ -283,10 +284,14 @@ deposit_confirmation_run (void *cls,
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (dcs->amount_without_fee,
                                          &amount_without_fee));
-  /* timestamp is mandatory */
   {
     struct GNUNET_JSON_Specification spec[] = {
-      TALER_JSON_spec_absolute_time ("timestamp", &timestamp),
+      /* timestamp is mandatory */
+      TALER_JSON_spec_absolute_time ("timestamp",
+                                     &timestamp),
+      GNUNET_JSON_spec_mark_optional (
+        TALER_JSON_spec_absolute_time ("refund_deadline",
+                                       &refund_deadline)),
       GNUNET_JSON_spec_end ()
     };
 
@@ -299,22 +304,8 @@ deposit_confirmation_run (void *cls,
       TALER_TESTING_interpreter_fail (is);
       return;
     }
-  }
-  /* refund deadline is optional, defaults to zero */
-  {
-    struct GNUNET_JSON_Specification spec[] = {
-      TALER_JSON_spec_absolute_time ("refund_deadline",
-                                     &refund_deadline),
-      GNUNET_JSON_spec_end ()
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (contract_terms,
-                           spec,
-                           NULL, NULL))
-    {
+    if (0 == refund_deadline.abs_value_us)
       refund_deadline = timestamp;
-    }
   }
   dcs->dc = TALER_AUDITOR_deposit_confirmation (dcs->auditor,
                                                 &h_wire,
diff --git a/src/testing/testing_api_cmd_exec_auditor-offline.c b/src/testing/testing_api_cmd_exec_auditor-offline.c
new file mode 100644
index 000000000..1899d5c06
--- /dev/null
+++ b/src/testing/testing_api_cmd_exec_auditor-offline.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 testing/testing_api_cmd_exec_auditor-offline.c
+ * @brief run the taler-exchange-auditor-offline command
+ * @author Marcello Stanisci
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_signatures.h"
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "auditor-offline" CMD.
+ */
+struct AuditorOfflineState
+{
+
+  /**
+   * AuditorOffline process.
+   */
+  struct GNUNET_OS_Process *auditor_offline_proc;
+
+  /**
+   * Configuration file used by the auditor-offline.
+   */
+  const char *config_filename;
+
+};
+
+
+/**
+ * Run the command.  Use the `taler-exchange-auditor-offline' program.
+ *
+ * @param cls closure.
+ * @param cmd command being run.
+ * @param is interpreter state.
+ */
+static void
+auditor_offline_run (void *cls,
+                     const struct TALER_TESTING_Command *cmd,
+                     struct TALER_TESTING_Interpreter *is)
+{
+  struct AuditorOfflineState *as = cls;
+
+  (void) cmd;
+  as->auditor_offline_proc
+    = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
+                               NULL, NULL, NULL,
+                               "taler-auditor-offline",
+                               "taler-auditor-offline",
+                               "-c", as->config_filename,
+                               "-L", "INFO",
+                               "download",
+                               "sign",
+                               "upload",
+                               NULL);
+  if (NULL == as->auditor_offline_proc)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  TALER_TESTING_wait_for_sigchld (is);
+}
+
+
+/**
+ * Free the state of a "auditor-offline" CMD, and possibly kill its
+ * process if it did not terminate correctly.
+ *
+ * @param cls closure.
+ * @param cmd the command being freed.
+ */
+static void
+auditor_offline_cleanup (void *cls,
+                         const struct TALER_TESTING_Command *cmd)
+{
+  struct AuditorOfflineState *as = cls;
+
+  (void) cmd;
+  if (NULL != as->auditor_offline_proc)
+  {
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (as->auditor_offline_proc,
+                                          SIGKILL));
+    GNUNET_OS_process_wait (as->auditor_offline_proc);
+    GNUNET_OS_process_destroy (as->auditor_offline_proc);
+    as->auditor_offline_proc = NULL;
+  }
+  GNUNET_free (as);
+}
+
+
+/**
+ * Offer "auditor-offline" CMD internal data to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+auditor_offline_traits (void *cls,
+                        const void **ret,
+                        const char *trait,
+                        unsigned int index)
+{
+  struct AuditorOfflineState *as = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_process (&as->auditor_offline_proc),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_auditor_offline (const char *label,
+                                        const char *config_filename)
+{
+  struct AuditorOfflineState *as;
+
+  as = GNUNET_new (struct AuditorOfflineState);
+  as->config_filename = config_filename;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = as,
+      .label = label,
+      .run = &auditor_offline_run,
+      .cleanup = &auditor_offline_cleanup,
+      .traits = &auditor_offline_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_exec_auditor-offline.c */