diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-09-13 12:19:02 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-09-13 12:20:10 +0200 |
| commit | fed7102ad5e24382c1ceed089e92498098084075 (patch) | |
| tree | ccb0de9506ac548d5ad979105b7d64efa7046c2a /src/auditor/test-revocation.sh | |
| parent | 0a618f77cd6d9dca248877e7f51409e8c420891a (diff) | |
-fix test-auditor.sh
Diffstat (limited to 'src/auditor/test-revocation.sh')
| -rwxr-xr-x | src/auditor/test-revocation.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh index f37a88385..2809b8ea1 100755 --- a/src/auditor/test-revocation.sh +++ b/src/auditor/test-revocation.sh @@ -552,10 +552,15 @@ function test_4() { function check_with_database() { BASEDB=$1 + # Configuration file to use + CONF=$1.conf echo "Running test suite with database $BASEDB using configuration $CONF" - # Setup database-specific globals - MASTER_PUB=`cat ${BASEDB}.mpub` + MASTER_PRIV_FILE=${BASEDB}.mpriv + taler-config -f -c ${CONF} -s exchange-offline -o MASTER_PRIV_FILE -V ${MASTER_PRIV_FILE} + MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE` + + echo "MASTER PUB is ${MASTER_PUB} using file ${MASTER_PRIV_FILE}" # Load database full_reload @@ -582,9 +587,6 @@ function check_with_database() # Postgres database to use (must match revoke-basedb.conf) DB=taler-auditor-test -# Configuration file to use -CONF=revoke-basedb.conf - # test required commands exist echo "Testing for jq" jq -h > /dev/null || exit_skip "jq required" @@ -626,9 +628,9 @@ EXPORT PGHOST="@POSTGRES_SOCKET" MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX` echo "Generating fresh database at $MYDIR" -if faketime -f '-1 d' ./generate-revoke-basedb.sh $MYDIR/basedb +if faketime -f '-1 d' ./generate-revoke-basedb.sh $MYDIR/revoke-basedb then - check_with_database $MYDIR/basedb + check_with_database $MYDIR/revoke-basedb if test x$fail != x0 then exit $fail |