nicer logging

This commit is contained in:
Christian Grothoff 2019-12-24 16:19:53 +01:00
parent 1970b7687c
commit 8b5a0278df
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC

View File

@ -142,6 +142,7 @@ echo "Checking output"
# if an emergency was detected, that is a bug and we should fail # if an emergency was detected, that is a bug and we should fail
echo -n "Test for emergencies... " echo -n "Test for emergencies... "
jq -e .emergencies[0] < test-audit.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS jq -e .emergencies[0] < test-audit.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
echo -n "Test for deposit confirmation emergencies... "
jq -e .deposit_confirmation_inconsistencies[0] < test-audit.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS jq -e .deposit_confirmation_inconsistencies[0] < test-audit.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
echo -n "Test for emergencies by count... " echo -n "Test for emergencies by count... "
jq -e .emergencies_by_count[0] < test-audit.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS jq -e .emergencies_by_count[0] < test-audit.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
@ -1471,17 +1472,19 @@ echo "DONE"
check_with_database() check_with_database()
{ {
BASEDB=$1 BASEDB=$1
echo "Running test suite with database $BASEDB" echo "Running test suite with database $BASEDB using configuration $CONF"
# Setup database-specific globals # Setup database-specific globals
MASTER_PUB=`cat ${BASEDB}.mpub` MASTER_PUB=`cat ${BASEDB}.mpub`
# Where to store wire fee details for aggregator # Where to store wire fee details for aggregator
echo "Storing wire fees"
WIRE_FEE_DIR=`taler-config -c $CONF -f -s exchangedb -o WIREFEE_BASE_DIR` WIRE_FEE_DIR=`taler-config -c $CONF -f -s exchangedb -o WIREFEE_BASE_DIR`
mkdir -p $WIRE_FEE_DIR mkdir -p $WIRE_FEE_DIR
cp ${BASEDB}.fees $WIRE_FEE_DIR/x-taler-bank.fee cp ${BASEDB}.fees $WIRE_FEE_DIR/x-taler-bank.fee
# Determine database age # Determine database age
echo "Calculating database age"
AGE=`stat -c %Y ${BASEDB}.fees` AGE=`stat -c %Y ${BASEDB}.fees`
NOW=`date +%s` NOW=`date +%s`
DATABASE_AGE=`expr $NOW - $AGE` DATABASE_AGE=`expr $NOW - $AGE`