From 4e93638683242d4c5d61aac8fe4027b333d7318a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 3 Oct 2020 12:26:43 +0200
Subject: [PATCH] use current bank CLI and CFG options for auditor tests

---
 src/auditor/generate-auditor-basedb.conf | 1 +
 src/auditor/test-auditor.conf            | 1 +
 src/auditor/test-auditor.sh              | 4 ++--
 src/auditor/test-revocation.sh           | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index 99721d3d6..a130aebec 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -62,6 +62,7 @@ HTTP_PORT = 8082
 SUGGESTED_EXCHANGE = http://localhost:8081/
 SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost/2
 ALLOW_REGISTRATIONS = YES
+SERVE = http
 
 [exchangedb]
 AUDITOR_BASE_DIR = ${TALER_DATA_HOME}/auditors/
diff --git a/src/auditor/test-auditor.conf b/src/auditor/test-auditor.conf
index 829300b4d..a6c484957 100644
--- a/src/auditor/test-auditor.conf
+++ b/src/auditor/test-auditor.conf
@@ -32,3 +32,4 @@ MAX_DEBT_BANK = TESTKUDOS:100000.0
 HTTP_PORT = 8082
 SUGGESTED_EXCHANGE = http://localhost:8081/
 SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost/2
+SERVE = http
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index fddec1dee..92840d48a 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -57,7 +57,7 @@ trap cleanup EXIT
 function pre_audit () {
     # Launch bank
     echo -n "Launching bank "
-    taler-bank-manage-testing $CONF postgres:///$DB serve-http 2>bank.err >bank.log &
+    taler-bank-manage-testing $CONF postgres:///$DB serve 2>bank.err >bank.log &
     for n in `seq 1 80`
     do
         echo -n "."
@@ -370,7 +370,7 @@ echo -n "Testing inconsistency detection... "
 ROW=`jq .reserve_in_amount_inconsistencies[0].row < test-audit-wire.json`
 if test $ROW != 1
 then
-    exit_fail "Row wrong"
+    exit_fail "Row $ROW is wrong"
 fi
 WIRED=`jq -r .reserve_in_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
 if test $WIRED != "TESTKUDOS:10"
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index b70f09225..dfec08a17 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -57,7 +57,7 @@ trap cleanup EXIT
 function pre_audit () {
     # Launch bank
     echo -n "Launching bank "
-    taler-bank-manage-testing $CONF postgres:///$DB serve-http 2>bank.err >bank.log &
+    taler-bank-manage-testing $CONF postgres:///$DB serve 2>bank.err >bank.log &
     for n in `seq 1 80`
     do
         echo -n "."