summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-08-28 18:28:53 +0200
committerChristian Grothoff <christian@grothoff.org>2020-08-28 18:28:53 +0200
commit51fa812cf47d8238cca784834a70eafcd0306d04 (patch)
treef083a234746c4e0e576885f3ddcd87e67cda73f7
parentd089c31e5e5dcab03c6988d87c61c839e447b05b (diff)
downloadexchange-51fa812cf47d8238cca784834a70eafcd0306d04.tar.gz
exchange-51fa812cf47d8238cca784834a70eafcd0306d04.tar.bz2
exchange-51fa812cf47d8238cca784834a70eafcd0306d04.zip
do setup instance
-rwxr-xr-xsrc/auditor/generate-auditor-basedb.sh7
-rwxr-xr-xsrc/auditor/test-auditor.sh4
-rwxr-xr-xsrc/auditor/test-revocation.sh2
3 files changed, 10 insertions, 3 deletions
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 8678c6ca..1e5ea5c1 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -61,6 +61,7 @@ echo " FOUND"
# Clean up
+
DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
rm -rf $DATA_DIR || true
@@ -137,6 +138,12 @@ if [ 1 != $OK ]
then
exit_skip "Failed to launch services"
fi
+
+# Setup merchant
+
+curl -H "Content-Type: application/json" -X POST -d '{"payto_uris":["payto://x-taler-bank/localhost:8082/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/private/instances
+
+
echo " DONE"
# run wallet CLI
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index db8e73a7..4326fda4 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -122,7 +122,6 @@ function post_audit () {
taler-exchange-dbinit -g || exit_fail "exchange DB GC failed"
cleanup
- echo "DONE"
echo -n "TeXing ."
taler-helper-auditor-render.py test-audit-aggregation.json test-audit-coins.json test-audit-deposits.json test-audit-reserves.json test-audit-wire.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"
@@ -1882,10 +1881,11 @@ else
fi
# run tests with pre-build database, if one is available
-if test -x auditor-basedb.mpub
+if test -r auditor-basedb.mpub
then
check_with_database "auditor-basedb"
else
+ echo "Lacking auditor-basedb.mpub, skipping test"
fail=77
fi
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index a65ba196..eec279b5 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -553,7 +553,7 @@ else
fi
# run tests with pre-build database, if one is available
-if test -x revoke-basedb.mpub
+if test -r revoke-basedb.mpub
then
check_with_database "revoke-basedb"
else