diff options
Diffstat (limited to 'integrationtests/common.sh')
| -rw-r--r-- | integrationtests/common.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/integrationtests/common.sh b/integrationtests/common.sh index 0104dbc9c..4b42531b8 100644 --- a/integrationtests/common.sh +++ b/integrationtests/common.sh @@ -14,7 +14,6 @@ function setup_config() { [[ "$(taler-merchant-httpd -v)" =~ "taler-merchant-httpd v" ]] || exit_skip " MISSING" echo " FOUND" - trap shutdown_services ERR trap shutdown_services EXIT SCRIPT_NAME=$1 @@ -32,6 +31,9 @@ function setup_config() { export CONF=test-${SCRIPT_NAME}.conf cp template.conf "$CONF" + export WALLET_DB=wallet-${SCRIPT_NAME}.json + rm "$WALLET_DB" 2> /dev/null || true + # Clean up DATA_DIR=$(taler-config -f -c "$CONF" -s PATHS -o TALER_HOME) rm -rf "$DATA_DIR" || true @@ -142,6 +144,8 @@ function shutdown_services() { echo "Final clean up" dropdb "$TARGET_DB" >/dev/null 2>/dev/null || true + rm "$WALLET_DB" 2> /dev/null || true + rm -rf "$DATA_DIR" || true rm "$CONF" } |