diff options
author | Christian Grothoff <christian@grothoff.org> | 2023-07-20 02:15:58 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2023-07-20 02:15:58 +0200 |
commit | 59e057b93e65c73dc3cd57dcced563847d85ba77 (patch) | |
tree | 84677266a32fc0ff25d51f694e9de83aaa55106e /src/auditor | |
parent | 50c0cc489d9a9a2a82b643ae09eb78af9e599db6 (diff) |
-misc fixes
Diffstat (limited to 'src/auditor')
-rw-r--r-- | src/auditor/generate-auditor-basedb.conf | 1 | ||||
-rwxr-xr-x | src/auditor/generate-auditor-basedb.sh | 7 | ||||
-rwxr-xr-x | src/auditor/test-auditor.sh | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf index 9cc329c8f..985efdaa5 100644 --- a/src/auditor/generate-auditor-basedb.conf +++ b/src/auditor/generate-auditor-basedb.conf @@ -3,7 +3,6 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/ TALER_CONFIG_HOME = $TALER_HOME/.config/taler/ TALER_DATA_HOME = $TALER_HOME/.local/share/taler/ TALER_HOME = ${PWD}/generate_auditordb_home/ - [taler] CURRENCY = TESTKUDOS CURRENCY_ROUND_UNIT = TESTKUDOS:0.01 diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index 6399d94b6..55127fffb 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -24,9 +24,9 @@ echo " FOUND" CONF="generate-auditor-basedb.conf" # reset database -echo -n "Reset 'auditor-basedb' database ..." +echo -n "Reset 'auditor-basedb' database at $PGHOST ..." dropdb "auditor-basedb" >/dev/null 2>/dev/null || true -createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB'" +createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB' at $PGHOST" echo " DONE" # Launch exchange, merchant and bank. @@ -70,6 +70,9 @@ taler-wallet-cli \ )" &> taler-wallet-cli.log echo " DONE" +taler-wallet-cli --wallet-db="$WALLET_DB" run-until-done +taler-wallet-cli --wallet-db="$WALLET_DB" advanced run-pending + # Dump database mkdir -p "$(dirname "$BASEDB")" diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index a3992f798..fb350a794 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -472,7 +472,7 @@ function run_audit () { # Do a full reload of the (original) database function full_reload() { - echo -n "Doing full reload of the database ($BASEDB - $DB)... " + echo -n "Doing full reload of the database (loading ${BASEDB}.sql into $DB at $PGHOST)... " dropdb "$DB" 2> /dev/null || true createdb -T template0 "$DB" \ || exit_skip "could not create database $DB (at $PGHOST)" @@ -2341,19 +2341,15 @@ echo " DONE" PGHOST="$TMPDIR/sockets" export PGHOST -# FIXME: here for testing, avoids generation skip. -# Should probably introduce getopt to make this -# possible via CLI. -check_with_database "bar/${DB}" - - -exit 0 - MYDIR="${MY_TMP_DIR}/basedb" mkdir -p "${MYDIR}" echo "Generating fresh database at $MYDIR" if faketime -f '-1 d' ./generate-auditor-basedb.sh "$MYDIR/$DB" then + echo -n "Reset 'auditor-basedb' database at $PGHOST ..." + dropdb "auditor-basedb" >/dev/null 2>/dev/null || true + createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB' at $PGHOST" + echo " DONE" check_with_database "$MYDIR/$DB" if [ "$fail" != "0" ] then |