From d5351641f8124040c02ced06690fda36535bedcf Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 28 Mar 2020 20:45:53 +0100 Subject: implement #6049 --- src/testing/test_taler_exchange_wirewatch.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/testing/test_taler_exchange_wirewatch.c') diff --git a/src/testing/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c index 6d7a144e2..fbcf742f5 100644 --- a/src/testing/test_taler_exchange_wirewatch.c +++ b/src/testing/test_taler_exchange_wirewatch.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2016, 2017, 2018 Taler Systems SA + (C) 2016-2020 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 @@ -57,7 +57,6 @@ static char *config_filename; */ #define CMD_EXEC_AGGREGATOR(label) \ TALER_TESTING_cmd_exec_aggregator (label "-aggregator", config_filename), \ - TALER_TESTING_cmd_exec_closer (label "-closer", config_filename), \ TALER_TESTING_cmd_exec_transfer (label "-transfer", config_filename) @@ -101,12 +100,25 @@ run (void *cls, bc.exchange_payto, // credit "run-transfer-good-to-exchange"), - CMD_EXEC_AGGREGATOR ("run-aggregator-non-expired-reserve"), + TALER_TESTING_cmd_exec_closer ("run-closer-non-expired-reserve", + config_filename, + NULL, + NULL, + NULL), + TALER_TESTING_cmd_exec_transfer ("do-idle-transfer", config_filename), TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-1"), TALER_TESTING_cmd_sleep ("wait (5s)", 5), - CMD_EXEC_AGGREGATOR ("run-aggregator-on-expired-reserve"), + TALER_TESTING_cmd_exec_closer ("run-closer-expired-reserve", + config_filename, + "EUR:4.99", + "EUR:0.01", + "run-transfer-good-to-exchange"), + TALER_TESTING_cmd_exec_transfer ("do-closing-transfer", + config_filename), + + CMD_EXEC_AGGREGATOR ("run-closer-on-expired-reserve"), TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-1", ec.exchange_url, "EUR:4.99", -- cgit v1.2.3