From 035e052c39923ce9017ffc76a1baef054606a08d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 24 Sep 2022 00:16:51 +0200
Subject: -fix test-revocation

---
 src/auditor/generate-auditor-basedb.sh | 2 +-
 src/auditor/generate-revoke-basedb.sh  | 9 ++++++---
 src/auditor/test-auditor.sh            | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/auditor')

diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 0c52a06c4..7c68acf48 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -14,7 +14,7 @@
 # and be allowed to create/drop databases.
 #
 set -eu
-# set -x
+#set -x
 
 function get_iban() {
     export LIBEUFIN_SANDBOX_USERNAME=$1
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index f262b4960..4188f0517 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -591,16 +591,19 @@ exit_cleanup
 echo "Dumping database"
 echo "Dumping PostgreSQL database: ${BASEDB}.sql"
 pg_dump -O $TARGET_DB | sed -e '/AS integer/d' > ${BASEDB}.sql
-echo "Dumping libeufin database: ${BASEDB}-libeufin.sql"
+echo "Dumping libeufin database: ${TARGET_DB}-libeufin-*.sql"
+cd $MY_TMP_DIR
 sqlite3 ${TARGET_DB}-nexus.sqlite3 ".dump" > ${BASEDB}-libeufin-nexus.sql
 sqlite3 ${TARGET_DB}-sandbox.sqlite3 ".dump" > ${BASEDB}-libeufin-sandbox.sql
 
+rm ${TARGET_DB}-sandbox.sqlite3 ${TARGET_DB}-nexus.sqlite3 # libeufin DB
+
+cd $ORIGIN
+
 echo $MASTER_PUB > ${BASEDB}.mpub
 
-# clean up
 echo "Final clean up"
 dropdb $TARGET_DB
-rm ${TARGET_DB}-sandbox.sqlite3 ${TARGET_DB}-nexus.sqlite3 # libeufin DB
 
 echo "====================================="
 echo "  Finished generation of $BASEDB "
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index b77f14223..c9895b6f3 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #  This file is part of TALER
-#  Copyright (C) 2014-2021 Taler Systems SA
+#  Copyright (C) 2014-2022 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
@@ -1207,7 +1207,7 @@ function test_16() {
     echo PASS
 
     stop_libeufin
-    echo "Second modification: wire nothing" 
+    echo "Second modification: wire nothing"
     NEW_AMOUNT="TESTKUDOS:0"
     echo "UPDATE TalerRequestedPayments SET amount='${NEW_AMOUNT}' WHERE id='1';" | sqlite3 ${MYDIR}/${DB}-nexus.sqlite3
     launch_libeufin
@@ -2028,7 +2028,7 @@ function check_with_database()
 
 # ####### Setup globals ######
 # Postgres database to use
-DB=auditor-basedb
+export DB=auditor-basedb
 
 # test required commands exist
 echo "Testing for jq"
-- 
cgit v1.2.3