aboutsummaryrefslogtreecommitdiff
path: root/src/auditor/test-auditor.sh
diff options
context:
space:
mode:
Diffstat (limited to 'src/auditor/test-auditor.sh')
-rwxr-xr-xsrc/auditor/test-auditor.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 222df84bf..aad233c7f 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -46,7 +46,7 @@ function pre_audit () {
46 do 46 do
47 echo -n "." 47 echo -n "."
48 wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null && break 48 wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null && break
49 sleep 1 49 sleep 0.1
50 done 50 done
51 echo " DONE" 51 echo " DONE"
52 52
@@ -63,7 +63,7 @@ function audit_only () {
63 # Run the auditor! 63 # Run the auditor!
64 echo -n "Running audit(s) ..." 64 echo -n "Running audit(s) ..."
65 taler-auditor -r -c $CONF -m $MASTER_PUB > test-audit.json 2> test-audit.log || exit_fail "auditor failed" 65 taler-auditor -r -c $CONF -m $MASTER_PUB > test-audit.json 2> test-audit.log || exit_fail "auditor failed"
66 66 echo -n "."
67 taler-wire-auditor -r -c $CONF -m $MASTER_PUB > test-wire-audit.json 2> test-wire-audit.log || exit_fail "wire auditor failed" 67 taler-wire-auditor -r -c $CONF -m $MASTER_PUB > test-wire-audit.json 2> test-wire-audit.log || exit_fail "wire auditor failed"
68 echo " DONE" 68 echo " DONE"
69} 69}
@@ -73,12 +73,14 @@ function audit_only () {
73function post_audit () { 73function post_audit () {
74 kill `jobs -p` || true 74 kill `jobs -p` || true
75 75
76 echo -n "TeXing ..." 76 echo -n "TeXing ."
77 ../../contrib/render.py test-audit.json test-wire-audit.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed" 77 ../../contrib/render.py test-audit.json test-wire-audit.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"
78 78
79 echo -n "."
79 timeout 10 pdflatex test-report.tex >/dev/null || exit_fail "pdflatex failed" 80 timeout 10 pdflatex test-report.tex >/dev/null || exit_fail "pdflatex failed"
81 echo -n "."
80 timeout 10 pdflatex test-report.tex >/dev/null 82 timeout 10 pdflatex test-report.tex >/dev/null
81 echo "DONE" 83 echo " DONE"
82} 84}
83 85
84 86
@@ -711,7 +713,7 @@ run_audit
711echo -n "Testing hung refresh detection... " 713echo -n "Testing hung refresh detection... "
712 714
713HANG=`jq -er .refresh_hanging[0].amount < test-audit.json` 715HANG=`jq -er .refresh_hanging[0].amount < test-audit.json`
714TOTAL_HANG=`jq -e .total_refresh_hanging < test-audit.json` 716TOTAL_HANG=`jq -er .total_refresh_hanging < test-audit.json`
715if test x$HANG != x$TOTAL_HANG 717if test x$HANG != x$TOTAL_HANG
716then 718then
717 exit_fail "Hanging amount inconsistent, got $HANG and $TOTAL_HANG" 719 exit_fail "Hanging amount inconsistent, got $HANG and $TOTAL_HANG"