From 0698835fedac705fa4c56e3692a06f62d3587381 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 16 Jul 2023 14:36:14 +0200 Subject: introduce TALER_TESTING_cmd_exec_wirewatch2 --- src/include/taler_testing_lib.h | 14 ++++++++++++++ src/testing/testing_api_cmd_exec_wirewatch.c | 28 ++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 90984b9f1..3cd0b145f 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -943,6 +943,20 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label, const char *config_filename); +/** + * Make a "wirewatch" CMD. + * + * @param label command label. + * @param config_filename configuration filename. + * @param account section to run wirewatch against + * @return the command. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_exec_wirewatch2 (const char *label, + const char *config_filename, + const char *account_section); + + /** * Request URL via "wget". * diff --git a/src/testing/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c index 32d23a170..6bc3f2c74 100644 --- a/src/testing/testing_api_cmd_exec_wirewatch.c +++ b/src/testing/testing_api_cmd_exec_wirewatch.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2018 Taler Systems SA + Copyright (C) 2018, 2023 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 @@ -43,6 +43,11 @@ struct WirewatchState * Configuration file used by the wirewatcher. */ const char *config_filename; + + /** + * Account section to be used by the wirewatcher. + */ + const char *account_section; }; @@ -71,6 +76,10 @@ wirewatch_run (void *cls, "-w", "0", "-t", /* exit when done */ "-L", "DEBUG", + (NULL == ws->account_section) + ? NULL + : "-a", + ws->account_section, NULL); if (NULL == ws->wirewatch_proc) { @@ -138,14 +147,15 @@ wirewatch_traits (void *cls, struct TALER_TESTING_Command -TALER_TESTING_cmd_exec_wirewatch (const char *label, - const char *config_filename) +TALER_TESTING_cmd_exec_wirewatch2 (const char *label, + const char *config_filename, + const char *account_section) { struct WirewatchState *ws; ws = GNUNET_new (struct WirewatchState); ws->config_filename = config_filename; - + ws->account_section = account_section; { struct TALER_TESTING_Command cmd = { .cls = ws, @@ -160,4 +170,14 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label, } +struct TALER_TESTING_Command +TALER_TESTING_cmd_exec_wirewatch (const char *label, + const char *config_filename) +{ + return TALER_TESTING_cmd_exec_wirewatch2 (label, + config_filename, + NULL); +} + + /* end of testing_api_cmd_exec_wirewatch.c */ -- cgit v1.2.3