diff options
| m--------- | contrib/gana | 0 | ||||
| m--------- | doc/prebuilt | 0 | ||||
| -rwxr-xr-x | src/auditor/generate-auditor-basedb.sh | 14 | ||||
| -rwxr-xr-x | src/auditor/test-auditor.sh | 16 | ||||
| -rwxr-xr-x | src/auditor/test-revocation.sh | 14 |
5 files changed, 27 insertions, 17 deletions
diff --git a/contrib/gana b/contrib/gana -Subproject 75c838e74c41bf9a6c02cdfe8109a444056bf26 +Subproject 5f6a1413a6053d1999064768188f1671eb01589 diff --git a/doc/prebuilt b/doc/prebuilt -Subproject 74d9c44ebc257a3d8b9c2c0a806508bd0cc5269 +Subproject b988d98d4856758484eb23c27bfdc9e602d4235 diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index d4d5cf839..09018f0cb 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -36,10 +36,18 @@ function cleanup() do kill $n 2> /dev/null || true done - echo Killing euFin.. - kill `cat libeufin-sandbox.pid 2> /dev/null` &> /dev/null || true - kill `cat libeufin-nexus.pid 2> /dev/null` &> /dev/null || true wait + echo "Killing Libeufin..." + if test -f libeufin-sandbox.pid + then + echo "Killing libeufin sandbox" + kill `cat libeufin-sandbox.pid 2> /dev/null` &> /dev/null || true + fi + if test -f libeufin-nexus.pid + then + echo "Killing libeufin nexus" + kill `cat libeufin-nexus.pid 2> /dev/null` &> /dev/null || true + fi } # Install cleanup handler (except for kill -9) diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index 1b48acbd4..9b9b21b7f 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -73,7 +73,7 @@ function cleanup() kill $n 2> /dev/null || true done wait - # kill euFin + echo "killing libeufin..." if test -f libeufin-sandbox.pid then echo "Killing libeufin sandbox" @@ -292,12 +292,12 @@ function run_audit () { # Do a full reload of the (original) database -full_reload() +function full_reload() { echo "Doing full reload of the database ($BASEDB)... " dropdb $DB 2> /dev/null || true rm -f $DB.sqlite3 2> /dev/null || true # libeufin - createdb -T template0 $DB || exit_skip "could not create database" + createdb -T template0 $DB || exit_skip "could not create database $DB (at $PGHOST)" # Import pre-generated database, -q(ietly) using single (-1) transaction psql -Aqt $DB -q -1 -f ${BASEDB}.sql > /dev/null || exit_skip "Failed to load database" echo "Loading libeufin basedb: ${BASEDB}-libeufin.sql" @@ -2017,11 +2017,11 @@ MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX` echo -n "Testing for Postgres" -HAVE_INITDB=`find /usr -name "initdb" | grep postgres` || exit_skip " MISSING" -echo " FOUND" +HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres` || exit_skip " MISSING" +echo " FOUND at" `dirname $HAVE_INITDB` echo -n "Setting up Postgres DB" -INITDB_BIN=`find /usr -name "initdb" | grep bin/initdb | grep postgres | sort -n | tail -n1` -POSTGRES_PATH=`basename $INITDB_BIN` +INITDB_BIN=`echo $HAVE_INITDB | grep bin/initdb | grep postgres | sort -n | tail -n1` +POSTGRES_PATH=`dirname $INITDB_BIN` TMPDIR=`mktemp -d /tmp/taler-test-postgresXXXXXX` $INITDB_BIN --no-sync --auth=trust -D ${TMPDIR} > postgres-dbinit.log 2> postgres-dbinit.err echo " DONE" @@ -2040,7 +2040,7 @@ mv $TMPDIR/pg_hba.conf.new $TMPDIR/pg_hba.conf ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null start > postgres-start.log 2> postgres-start.err echo " DONE" PGHOST="$TMPDIR/sockets" -EXPORT PGHOST="@POSTGRES_SOCKET" +export PGHOST echo "Generating fresh database at $MYDIR" diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh index 2809b8ea1..4fa26f3e0 100755 --- a/src/auditor/test-revocation.sh +++ b/src/auditor/test-revocation.sh @@ -600,16 +600,16 @@ echo "Testing for taler-wallet-cli" taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null || exit_skip "taler-wallet-cli required" echo -n "Testing for Postgres" -HAVE_INITDB=`find /usr -name "initdb" | grep postgres` || exit_skip " MISSING" -echo " FOUND" +HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres 2> /dev/null` || exit_skip " MISSING" +echo " FOUND at" `dirname $HAVE_INITDB` echo -n "Setting up Postgres DB" -INITDB_BIN=`find /usr -name "initdb" | grep bin/initdb | grep postgres | sort -n | tail -n1` -POSTGRES_PATH=`basename $INITDB_BIN` +INITDB_BIN=`echo $HAVE_INITDB | grep bin/initdb | grep postgres | sort -n | tail -n1 2> /dev/null` +POSTGRES_PATH=`dirname $INITDB_BIN` TMPDIR=`mktemp -d /tmp/taler-test-postgresXXXXXX` $INITDB_BIN --no-sync --auth=trust -D ${TMPDIR} > postgres-dbinit.log 2> postgres-dbinit.err echo " DONE" mkdir ${TMPDIR}/sockets -echo -n "Launching Postgres service" +echo -n "Launching Postgres service at $POSTGRES_PATH" cat - >> $TMPDIR/postgresql.conf <<EOF unix_socket_directories='${TMPDIR}/sockets' fsync=off @@ -623,7 +623,9 @@ mv $TMPDIR/pg_hba.conf.new $TMPDIR/pg_hba.conf ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null start > postgres-start.log 2> postgres-start.err echo " DONE" PGHOST="$TMPDIR/sockets" -EXPORT PGHOST="@POSTGRES_SOCKET" +export PGHOST + +bash MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX` |