diff options
Diffstat (limited to 'src/auditor/test-auditor.sh')
-rwxr-xr-x | src/auditor/test-auditor.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index f2a1aca56..7a7f0d29d 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh | |||
@@ -70,7 +70,13 @@ function audit_only () { | |||
70 | echo -n "Running audit(s) ..." | 70 | echo -n "Running audit(s) ..." |
71 | taler-auditor -r -c $CONF -m $MASTER_PUB > test-audit.json 2> test-audit.log || exit_fail "auditor failed" | 71 | taler-auditor -r -c $CONF -m $MASTER_PUB > test-audit.json 2> test-audit.log || exit_fail "auditor failed" |
72 | echo -n "." | 72 | echo -n "." |
73 | # Also do incremental run | ||
74 | taler-auditor -c $CONF -m $MASTER_PUB > test-audit-inc.json 2> test-audit-inc.log || exit_fail "auditor failed" | ||
75 | echo -n "." | ||
73 | taler-wire-auditor -r -c $CONF -m $MASTER_PUB > test-wire-audit.json 2> test-wire-audit.log || exit_fail "wire auditor failed" | 76 | taler-wire-auditor -r -c $CONF -m $MASTER_PUB > test-wire-audit.json 2> test-wire-audit.log || exit_fail "wire auditor failed" |
77 | # Also do incremental run | ||
78 | echo -n "." | ||
79 | taler-wire-auditor -c $CONF -m $MASTER_PUB > test-wire-audit-inc.json 2> test-wire-audit-inc.log || exit_fail "wire auditor failed" | ||
74 | echo " DONE" | 80 | echo " DONE" |
75 | } | 81 | } |
76 | 82 | ||
@@ -210,7 +216,7 @@ echo -n "Check for lag detection... " | |||
210 | # re-generating the test database as we do not | 216 | # re-generating the test database as we do not |
211 | # report lag of less than 1h (see GRACE_PERIOD in | 217 | # report lag of less than 1h (see GRACE_PERIOD in |
212 | # taler-wire-auditor.c) | 218 | # taler-wire-auditor.c) |
213 | AGE=`stat -c %Y ../benchmark/auditor-basedb.fees` | 219 | AGE=`stat -c %Y ${BASEDB}.fees` |
214 | NOW=`date +%s` | 220 | NOW=`date +%s` |
215 | DELTA=`expr $NOW - $AGE` | 221 | DELTA=`expr $NOW - $AGE` |
216 | if [ $DELTA -gt 3600 ] | 222 | if [ $DELTA -gt 3600 ] |
@@ -994,7 +1000,7 @@ echo "UPDATE app_banktransaction SET date='${OLD_DATE}' WHERE id='${OLD_ID}';" | | |||
994 | # Postgres database to use | 1000 | # Postgres database to use |
995 | DB=taler-auditor-test | 1001 | DB=taler-auditor-test |
996 | # Prefix for the data resources to use | 1002 | # Prefix for the data resources to use |
997 | BASEDB="../benchmark/auditor-basedb" | 1003 | BASEDB="auditor-basedb" |
998 | MASTER_PUB=`cat ${BASEDB}.mpub` | 1004 | MASTER_PUB=`cat ${BASEDB}.mpub` |
999 | # Configuration file to use | 1005 | # Configuration file to use |
1000 | CONF=test-auditor.conf | 1006 | CONF=test-auditor.conf |