diff options
| author | Florian Dold <florian@dold.me> | 2021-12-01 12:08:03 +0100 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2021-12-01 12:08:03 +0100 |
| commit | dbaec85c258cdf017685ea14d67f050ac22b8baa (patch) | |
| tree | 88f4a7a072238c3626cd171af8ebdea44559d3c6 | |
| parent | 6d4e3f59bc03d6fc9b519be84692a707ab906a38 (diff) | |
| download | merchant-dbaec85c258cdf017685ea14d67f050ac22b8baa.tar.gz merchant-dbaec85c258cdf017685ea14d67f050ac22b8baa.tar.bz2 merchant-dbaec85c258cdf017685ea14d67f050ac22b8baa.zip | |
fix wallet and aggregator invocation (no KYC!) in test cases
| -rwxr-xr-x | src/testing/test_merchant_order_creation.sh | 8 | ||||
| -rwxr-xr-x | src/testing/test_merchant_transfer_tracking.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh index dfe1759c..04ee34ea 100755 --- a/src/testing/test_merchant_order_creation.sh +++ b/src/testing/test_merchant_order_creation.sh @@ -1,6 +1,10 @@ #!/bin/bash # This file is in the public domain. +set -eu + +set -x + . initialize_taler_system.sh echo -n "First prepare wallet with coins..." @@ -18,7 +22,7 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'withdrawTestBalance' taler-wallet-cli --wallet-db=$WALLET_DB run-until-done 2>wallet-withdraw-finish-1.err >wallet-withdraw-finish-1.out echo " OK" -CURRENCY_COUNT=$(taler-wallet-cli balance | jq '.balances|length') +CURRENCY_COUNT=$(taler-wallet-cli --wallet-db=$WALLET_DB balance | jq '.balances|length') if [ "$CURRENCY_COUNT" != "1" ] then echo 'should have one currency, withdrawal failed. check log.' @@ -322,7 +326,7 @@ TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))` echo waiting $TO_SLEEP secs for wire transfer echo -n "Perform wire transfers ..." -taler-exchange-aggregator -c $CONF -T ${TO_SLEEP}000000 -t -L INFO &> aggregator.log +taler-exchange-aggregator -y -c $CONF -T ${TO_SLEEP}000000 -t -L INFO &> aggregator.log taler-exchange-transfer -c $CONF -t -L INFO &> transfer.log echo " DONE" diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh index 5a2a29e0..b677a062 100755 --- a/src/testing/test_merchant_transfer_tracking.sh +++ b/src/testing/test_merchant_transfer_tracking.sh @@ -137,7 +137,7 @@ TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))` echo "waiting $TO_SLEEP secs for wire transfer" echo -n "Perform wire transfers ..." -taler-exchange-aggregator -c $CONF -T ${TO_SLEEP}000000 -t -L INFO &> aggregator.log +taler-exchange-aggregator -y -c $CONF -T ${TO_SLEEP}000000 -t -L INFO &> aggregator.log taler-exchange-transfer -c $CONF -t -L INFO &> transfer.log echo " DONE" |