summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-08-14 16:18:58 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-08-14 16:21:13 +0530
commit8239a8bdd1e50478e054867eb9ccdc82342db6be (patch)
tree1a7364c9b515625c583ec44908b37514ff3eb70b /src
parentf581b54dfbe0996c2b25ccf4995967e594811597 (diff)
downloadexchange-8239a8bdd1e50478e054867eb9ccdc82342db6be.tar.gz
exchange-8239a8bdd1e50478e054867eb9ccdc82342db6be.tar.bz2
exchange-8239a8bdd1e50478e054867eb9ccdc82342db6be.zip
taler wallet invocation
Diffstat (limited to 'src')
-rwxr-xr-xsrc/auditor/generate-auditor-basedb.sh18
-rwxr-xr-xsrc/auditor/generate-revoke-basedb.sh18
2 files changed, 27 insertions, 9 deletions
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 82a593fd8..b75112e60 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -15,8 +15,6 @@
#
set -eu
-echo "Script disabled: taler-wallet-cli integration test known to fail right now!"
-exit 1
trap "kill `jobs -p` &> /dev/null || true" ERR
@@ -134,6 +132,22 @@ echo " DONE"
echo "Running wallet"
taler-wallet-cli testing integrationtest -e $EXCHANGE_URL -m $MERCHANT_URL -b $BANK_URL
+taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \
+ "$(jq -n '
+ {
+ amountToSpend: "TESTKUDOS:5",
+ amountToWithdraw: "TESTKUDOS:10",
+ bankBaseUrl: $BANK_URL,
+ exchangeBaseUrl: $EXCHANGE_URL,
+ merchantApiKey: "sandbox",
+ merchantBaseUrl: $MERCHANT_URL,
+ }' \
+ --arg MERCHANT_URL "$MERCHANT_URL" \
+ --arg EXCHANGE_URL "$EXCHANGE_URL" \
+ --arg BANK_URL "$BANK_URL"
+ )"
+
+
echo "Shutting down services"
kill `jobs -p`
wait
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index 00ad3a6c1..fda768574 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -8,10 +8,6 @@
set -eu
-echo "Script disabled: taler-wallet-cli integration test known to fail right now!"
-exit 1
-
-
trap "kill `jobs -p` &> /dev/null || true" ERR
# Exit, with status code "skip" (no 'real' failure)
@@ -183,9 +179,17 @@ taler-wallet-cli --wallet-db=$WALLET_DB run-until-done
# Now we buy something, only the coins resulting from recouped will be
# used, as other ones are suspended
-taler-wallet-cli --wallet-db=$WALLET_DB testing test-pay \
- -m $MERCHANT_URL -k sandbox \
- -a "TESTKUDOS:1" -s "foo"
+taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'testPay' \
+ "$(jq -n '
+ {
+ amount: "TESTKUDOS:1",
+ merchantApiKey: "sandbox",
+ merchantBaseUrl: $MERCHANT_URL,
+ summary: "foo",
+ }' \
+ --arg MERCHANT_URL $MERCHANT_URL
+ )"
+
taler-wallet-cli --wallet-db=$WALLET_DB run-until-done
echo "Purchase with recoup'ed coin (via reserve) done"