From b7c75bd56a484efcf77210f1541cda67e2a90f61 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 6 May 2020 16:05:38 -0300 Subject: integration test for handling the same pay URI multiple times --- integrationtests/common.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'integrationtests/common.sh') diff --git a/integrationtests/common.sh b/integrationtests/common.sh index 82b3a129f..0104dbc9c 100644 --- a/integrationtests/common.sh +++ b/integrationtests/common.sh @@ -14,8 +14,8 @@ function setup_config() { [[ "$(taler-merchant-httpd -v)" =~ "taler-merchant-httpd v" ]] || exit_skip " MISSING" echo " FOUND" - trap 'jobs -p | xargs kill &> /dev/null || true' ERR - trap 'jobs -p | xargs kill &> /dev/null || true' EXIT + trap shutdown_services ERR + trap shutdown_services EXIT SCRIPT_NAME=$1 @@ -135,7 +135,7 @@ function wait_for_services() { function shutdown_services() { echo "Shutting down services" - jobs -p | xargs kill + jobs -p | xargs --no-run-if-empty kill || true wait # clean up @@ -151,3 +151,8 @@ function exit_skip() { echo "$1" exit 77 } + +function exit_error() { + echo "Error: $1" + exit 1 +} -- cgit v1.2.3